Skip to content

Commit 08a2f37

Browse files
committed
Miscellaneous CI fixes (addresses #32)
1 parent d3c873f commit 08a2f37

File tree

3 files changed

+19
-8
lines changed

3 files changed

+19
-8
lines changed

.appveyor.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ platform:
66
environment:
77
global:
88
DISTUTILS_USE_SDK: 1
9+
PYTHONWARNINGS: ignore:DEPRECATION
910
MSSdk: 1
1011
matrix:
1112
- PYTHON: 27
@@ -32,9 +33,14 @@ build_script:
3233
- ps: |
3334
if ($env:PYTHON) {
3435
python setup.py sdist
35-
pip install --verbose dist\python_example-0.0.1.tar.gz
36+
python -m pip install 'pybind11>=2.3'
37+
cd dist
38+
python -m pip install --verbose python_example-0.0.1.tar.gz
39+
cd ..
3640
} else {
41+
echo "conda build conda.recipe"
3742
conda build conda.recipe
43+
echo "conda install --use-local python_example"
3844
conda install --use-local python_example
3945
}
4046
test_script:

.travis.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ matrix:
55
- os: linux
66
env: PYTHON=2.7
77
- os: linux
8-
env: PYTHON=3.5
8+
env: PYTHON=3.6
99
- os: linux
1010
env: CONDA=2.7
1111
- os: linux
@@ -22,11 +22,14 @@ before_install:
2222
- |
2323
if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX=g++-4.8 CC=gcc-4.8; fi
2424
if [ -n "$PYTHON" ]; then
25-
if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "${PYTHON:0:1}" = "3" ]; then
26-
brew update; brew install python3;
25+
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
26+
export PATH="/Users/travis/Library/Python/2.7/bin:$PATH"
27+
if [ "${PYTHON:0:1}" = "3" ]; then
28+
brew update; brew install python3;
29+
fi
2730
fi
28-
pip install --user --upgrade pip virtualenv
29-
virtualenv -p python$PYTHON venv
31+
python -m pip install --user virtualenv
32+
virtualenv -p python${PYTHON:0:1} venv
3033
source venv/bin/activate
3134
elif [ -n "$CONDA" ]; then
3235
if [ "$TRAVIS_OS_NAME" = "linux" ]; then OS=Linux-x86_64; else OS=MacOSX-x86_64; fi
@@ -44,7 +47,8 @@ install:
4447
- |
4548
if [ -n "$PYTHON" ]; then
4649
python setup.py sdist
47-
pip install --verbose dist/*.tar.gz
50+
python -m pip install 'pybind11>=2.3'
51+
python -m pip install --verbose dist/*.tar.gz
4852
elif [ -n "$CONDA" ]; then
4953
conda build conda.recipe
5054
conda install --use-local python_example

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ def build_extensions(self):
106106
description='A test project using pybind11',
107107
long_description='',
108108
ext_modules=ext_modules,
109-
install_requires=['pybind11>=2.2'],
109+
install_requires=['pybind11>=2.3'],
110+
setup_requires=['pybind11>=2.3'],
110111
cmdclass={'build_ext': BuildExt},
111112
zip_safe=False,
112113
)

0 commit comments

Comments
 (0)