diff --git a/.travis.yml b/.travis.yml index ddf5d45d..c3b8d548 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,11 @@ env: # Commit from opencv that you want to build - BUILD_COMMIT=70bbf17b133496bd7d54d034b0f94bd869e0e810 # pip dependencies to _build_ your project - - BUILD_DEPENDS="numpy>=1.11.1" + - BUILD_DEPENDS="numpy==1.11.1" # pip dependencies to _test_ your project. Include any dependencies # that you need, that are also specified in BUILD_DEPENDS, this will be # a separate install. - - TEST_DEPENDS="numpy>=1.11.1" + - TEST_DEPENDS="numpy==1.11.1" - PLAT=x86_64 - UNICODE_WIDTH=32 - secure: "mU040XIYWtDjRms27deQy5fNg9HBFF9fiLfSteBaMjopZKXFUBsdMTKYGEVvX8DA879guMdjG8Prw1aCFhTTYlWgJ0Afm4YucRC0vAD4HLNhqLJ2lIpRceR3+2qPX+Oz5ATVVRi3ghBeJ20LLtNgOgf6esQVjdrYNC+YqmguClHKEYAxS7ngW42iQP8HX2anRcz9q9H7exZ9fX/D1PJfMNka/mNaB5KXZu5zdLuk/E0VbWU2tMWVIDUvx4uBlpE1d8HixEV5LHnuVE/QI36BcyucYxstTNKW6pGYgrhkYf+0PX4BphZXwY7EUBwzXsYLmyge6yH8W6NfvTW0ZasFF6xzQc9bsj+gAZN7H+hN2a42VQqIpkoJw9sU0hqzCOQf6ZvWUQgwFdAHJRHqe/zk4456WxnF0kAgbZdKaGOl0/n0WvgHNqD5bgO8Zzb1XyJTKoR+eAtYKXuz3KgpxKvZMMQVr8wMlI1cFEuGjIm+7ZrYB5jPvQrVzV/DgOq4gkPHOjjhu478UFlhGA9/XWwcyidC3b7zuBN2E7xVuTMlKdk7URB3AHXfG5bZgUG80vllQDGXQDpHVnv4Qi8bGCzI4iKTpp4fCibbqxFLxW1jhjmgePseGcie7Avpe+zXznkbmM2BqMCu3QRmtmFL3eCifwMf3rCNlAs0Sd3iLmEvyos=" @@ -89,11 +89,15 @@ matrix: env: - MB_PYTHON_VERSION=3.6 - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 + - BUILD_DEPENDS=numpy==1.11.3 + - TEST_DEPENDS=numpy==1.11.3 - os: linux env: - MB_PYTHON_VERSION=3.6 - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 - PLAT=i686 + - BUILD_DEPENDS=numpy==1.11.3 + - TEST_DEPENDS=numpy==1.11.3 before_install: - source multibuild/common_utils.sh @@ -112,4 +116,4 @@ script: after_success: # Upload wheels to pypi - pip install twine - - if [ -n "$TRAVIS_TAG" ]; then twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*; else echo "Tag not set, deployment skipped."; fi \ No newline at end of file + - if [ -n "$TRAVIS_TAG" ]; then twine upload -u ${USER} -p ${PASS} --skip-existing ${TRAVIS_BUILD_DIR}/wheelhouse/opencv*; else echo "Tag not set, deployment skipped."; fi diff --git a/appveyor.yml b/appveyor.yml index 0c2d3cca..923d96a7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,34 +10,42 @@ environment: BUILD_ENV: "Visual Studio 14" BUILD_DIR: "build" PYTHON_VERSION: "2.7" + NP_VERSION: "1.11.1" - PYTHON: "C:/Python27-x64" BUILD_ENV: "Visual Studio 14 Win64" BUILD_DIR: "build64" PYTHON_VERSION: "2.7" + NP_VERSION: "1.11.1" - PYTHON: "C:/Python34" BUILD_ENV: "Visual Studio 14" BUILD_DIR: "build" PYTHON_VERSION: "3.4" + NP_VERSION: "1.11.1" - PYTHON: "C:/Python34-x64" BUILD_ENV: "Visual Studio 14 Win64" BUILD_DIR: "build64" PYTHON_VERSION: "3.4" + NP_VERSION: "1.11.1" - PYTHON: "C:/Python35" BUILD_ENV: "Visual Studio 14" BUILD_DIR: "build" PYTHON_VERSION: "3.5" + NP_VERSION: "1.11.1" - PYTHON: "C:/Python35-x64" BUILD_ENV: "Visual Studio 14 Win64" BUILD_DIR: "build64" PYTHON_VERSION: "3.5" + NP_VERSION: "1.11.1" - PYTHON: "C:/Python36" BUILD_ENV: "Visual Studio 14" BUILD_DIR: "build" PYTHON_VERSION: "3.6" + NP_VERSION: "1.11.3" - PYTHON: "C:/Python36-x64" BUILD_ENV: "Visual Studio 14 Win64" BUILD_DIR: "build64" PYTHON_VERSION: "3.6" + NP_VERSION: "1.11.3" install: - cmd: >- @@ -50,6 +58,8 @@ install: "%PYTHON%/python.exe" -m pip install -r requirements.txt + "%PYTHON%/python.exe" -m pip install "numpy==%NP_VERSION%" + build_script: - cmd: |- diff --git a/config.sh b/config.sh index 392ea16d..c86ad91d 100644 --- a/config.sh +++ b/config.sh @@ -41,7 +41,8 @@ function run_tests { source ../travis/test-wheels.sh else echo "Running for linux" - apt-get -y install libglib2.0-0 + apt-get update + apt-get -y install --fix-missing libglib2.0-0 cd /io/tests/ source /io/travis/test-wheels.sh fi diff --git a/requirements.txt b/requirements.txt index 0ec9ed36..6c4932c1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -numpy>=1.11.1 wheel twine diff --git a/travis/build-wheels-osx.sh b/travis/build-wheels-osx.sh index cf5b0437..c2e548f9 100644 --- a/travis/build-wheels-osx.sh +++ b/travis/build-wheels-osx.sh @@ -8,7 +8,7 @@ echo 'PYTHON_VERSION: '$PYTHON_VERSION echo 'PIP and brew installs' -pip install -r requirements.txt +pip install $BUILD_DEPENDS echo 'Config make' diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index 1bec8de2..67b6803f 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -11,7 +11,7 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do echo 'PWD : '$PWD echo 'PYBIN: '$PYBIN - $PYBIN/pip install -r requirements.txt + $PYBIN/pip install $BUILD_DEPENDS # Begin build echo 'Begin build'