diff --git a/.appveyor.yml b/.appveyor.yml index 1d296fb..770d9a5 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -6,6 +6,7 @@ platform: environment: global: DISTUTILS_USE_SDK: 1 + PYTHONWARNINGS: ignore:DEPRECATION MSSdk: 1 matrix: - PYTHON: 27 @@ -32,9 +33,14 @@ build_script: - ps: | if ($env:PYTHON) { python setup.py sdist - pip install --verbose dist\python_example-0.0.1.tar.gz + python -m pip install 'pybind11>=2.3' + cd dist + python -m pip install --verbose python_example-0.0.1.tar.gz + cd .. } else { + echo "conda build conda.recipe" conda build conda.recipe + echo "conda install --use-local python_example" conda install --use-local python_example } test_script: diff --git a/.travis.yml b/.travis.yml index 012eb5d..832feca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ matrix: - os: linux env: PYTHON=2.7 - os: linux - env: PYTHON=3.5 + env: PYTHON=3.6 - os: linux env: CONDA=2.7 - os: linux @@ -22,11 +22,14 @@ before_install: - | if [ "$TRAVIS_OS_NAME" = "linux" ]; then export CXX=g++-4.8 CC=gcc-4.8; fi if [ -n "$PYTHON" ]; then - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "${PYTHON:0:1}" = "3" ]; then - brew update; brew install python3; + if [ "$TRAVIS_OS_NAME" = "osx" ]; then + export PATH="/Users/travis/Library/Python/2.7/bin:$PATH" + if [ "${PYTHON:0:1}" = "3" ]; then + brew update; brew install python3; + fi fi - pip install --user --upgrade pip virtualenv - virtualenv -p python$PYTHON venv + python -m pip install --user virtualenv + virtualenv -p python${PYTHON:0:1} venv source venv/bin/activate elif [ -n "$CONDA" ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then OS=Linux-x86_64; else OS=MacOSX-x86_64; fi @@ -44,7 +47,8 @@ install: - | if [ -n "$PYTHON" ]; then python setup.py sdist - pip install --verbose dist/*.tar.gz + python -m pip install 'pybind11>=2.3' + python -m pip install --verbose dist/*.tar.gz elif [ -n "$CONDA" ]; then conda build conda.recipe conda install --use-local python_example diff --git a/setup.py b/setup.py index d91ca22..8056396 100644 --- a/setup.py +++ b/setup.py @@ -106,7 +106,8 @@ setup( description='A test project using pybind11', long_description='', ext_modules=ext_modules, - install_requires=['pybind11>=2.2'], + install_requires=['pybind11>=2.3'], + setup_requires=['pybind11>=2.3'], cmdclass={'build_ext': BuildExt}, zip_safe=False, )