From cc42fde1ad20ca09bff2cee9ca27510a4f207cb0 Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Mon, 27 Mar 2017 12:57:54 +0200 Subject: [PATCH 01/14] Relax numpy version requirements --- .travis.yml | 6 +++--- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ddf5d45d..ff3c77ef 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=" @@ -112,4 +112,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/requirements.txt b/requirements.txt index 0ec9ed36..330b395b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -numpy>=1.11.1 +numpy==1.11.1 wheel twine From 459a924b3b21192d8bdfe9827f24e7e340a8a834 Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Mon, 27 Mar 2017 14:28:38 +0200 Subject: [PATCH 02/14] Try relax numpy dependencies --- .travis.yml | 2 ++ requirements.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ff3c77ef..209ac0b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,11 +89,13 @@ matrix: env: - MB_PYTHON_VERSION=3.6 - DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64 + - BUILD_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 before_install: - source multibuild/common_utils.sh diff --git a/requirements.txt b/requirements.txt index 330b395b..0ec9ed36 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -numpy==1.11.1 +numpy>=1.11.1 wheel twine From 1a61a4ff7b62e1152f197a6ed49ee7f401900a24 Mon Sep 17 00:00:00 2001 From: Olli-Pekka Heinisuo Date: Sun, 26 Mar 2017 17:02:44 +0300 Subject: [PATCH 03/14] trying to make apt-get happy --- config.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 4957c4901f4a75c4cac9377f44652e0340ac2500 Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Tue, 28 Mar 2017 07:29:35 +0200 Subject: [PATCH 04/14] Remove requirements.txt installation This installs numpy, which now comes from travis.yml --- travis/build-wheels-osx.sh | 4 ---- travis/build-wheels.sh | 2 -- 2 files changed, 6 deletions(-) diff --git a/travis/build-wheels-osx.sh b/travis/build-wheels-osx.sh index cf5b0437..4da9dabc 100644 --- a/travis/build-wheels-osx.sh +++ b/travis/build-wheels-osx.sh @@ -6,10 +6,6 @@ export PYTHON_VERSION=${MB_PYTHON_VERSION/./} echo 'MB_PYTHON_VERSION: ' $MB_PYTHON_VERSION echo 'PYTHON_VERSION: '$PYTHON_VERSION -echo 'PIP and brew installs' - -pip install -r requirements.txt - echo 'Config make' cd opencv diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index 1bec8de2..a208ca64 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -11,8 +11,6 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do echo 'PWD : '$PWD echo 'PYBIN: '$PYBIN - $PYBIN/pip install -r requirements.txt - # Begin build echo 'Begin build' cd opencv From 647c5b6c8af8f4747c0c46aae182aa5fd072fe9d Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Tue, 28 Mar 2017 07:34:26 +0200 Subject: [PATCH 05/14] Move numpy's dependency to appveyer --- appveyor.yml | 9 +++++++++ requirements.txt | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0c2d3cca..4ffb993d 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.3" - PYTHON: "C:/Python27-x64" BUILD_ENV: "Visual Studio 14 Win64" BUILD_DIR: "build64" PYTHON_VERSION: "2.7" + NP_VERSION: "1.11.3" - PYTHON: "C:/Python34" BUILD_ENV: "Visual Studio 14" BUILD_DIR: "build" PYTHON_VERSION: "3.4" + NP_VERSION: "1.11.3" - PYTHON: "C:/Python34-x64" BUILD_ENV: "Visual Studio 14 Win64" BUILD_DIR: "build64" PYTHON_VERSION: "3.4" + NP_VERSION: "1.11.3" - PYTHON: "C:/Python35" BUILD_ENV: "Visual Studio 14" BUILD_DIR: "build" PYTHON_VERSION: "3.5" + NP_VERSION: "1.11.3" - PYTHON: "C:/Python35-x64" BUILD_ENV: "Visual Studio 14 Win64" BUILD_DIR: "build64" PYTHON_VERSION: "3.5" + NP_VERSION: "1.11.3" - 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: >- @@ -49,6 +57,7 @@ install: "%PYTHON%/python.exe" -m pip install --upgrade pip "%PYTHON%/python.exe" -m pip install -r requirements.txt + "%PYTHON%/python.exe" -m pip install numpy==%NP_VERSION% build_script: - cmd: |- 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 From 8a2e1aca864e1e452ca519e78253a69abd5883c1 Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Tue, 28 Mar 2017 07:53:14 +0200 Subject: [PATCH 06/14] Try quoting this --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4ffb993d..f006fe70 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,7 +57,7 @@ install: "%PYTHON%/python.exe" -m pip install --upgrade pip "%PYTHON%/python.exe" -m pip install -r requirements.txt - "%PYTHON%/python.exe" -m pip install numpy==%NP_VERSION% + "%PYTHON%/python.exe" -m pip install "numpy==%NP_VERSION%" build_script: - cmd: |- From a6cfacb3460b8932001867212837a94b1e0a7c93 Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Tue, 28 Mar 2017 08:01:53 +0200 Subject: [PATCH 07/14] Debug --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index f006fe70..7ddeabd6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,7 +57,7 @@ install: "%PYTHON%/python.exe" -m pip install --upgrade pip "%PYTHON%/python.exe" -m pip install -r requirements.txt - "%PYTHON%/python.exe" -m pip install "numpy==%NP_VERSION%" + "%PYTHON%/python.exe" -m pip install numpy==1.11.3 build_script: - cmd: |- From 3c37234c1b80a8565c5d249c88ca2f7c20e338cd Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Tue, 28 Mar 2017 08:14:04 +0200 Subject: [PATCH 08/14] Needed some whitespace --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 7ddeabd6..f784eceb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -57,7 +57,8 @@ install: "%PYTHON%/python.exe" -m pip install --upgrade pip "%PYTHON%/python.exe" -m pip install -r requirements.txt - "%PYTHON%/python.exe" -m pip install numpy==1.11.3 + + "%PYTHON%/python.exe" -m pip install "numpy==%NP_VERSION%" build_script: - cmd: |- From 1401931a8d3b4cf195910bd5a1e87516b6186155 Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Tue, 28 Mar 2017 09:52:27 +0200 Subject: [PATCH 09/14] Debug --- travis/build-wheels.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index a208ca64..43927b66 100755 --- a/travis/build-wheels.sh +++ b/travis/build-wheels.sh @@ -11,6 +11,8 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do echo 'PWD : '$PWD echo 'PYBIN: '$PYBIN + $PYBIN/pip install numpy==$BUILD_DEPENDS + # Begin build echo 'Begin build' cd opencv From 96113225905e9561077443bc3c8878fb9b9baf75 Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Tue, 28 Mar 2017 15:02:20 +0200 Subject: [PATCH 10/14] facepalm --- travis/build-wheels.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/build-wheels.sh b/travis/build-wheels.sh index 43927b66..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 numpy==$BUILD_DEPENDS + $PYBIN/pip install $BUILD_DEPENDS # Begin build echo 'Begin build' From 765f3ebb38f875178e57aacf939d03fbcd58b7c7 Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Wed, 29 Mar 2017 07:26:02 +0200 Subject: [PATCH 11/14] Install numpy on OSX --- travis/build-wheels-osx.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/travis/build-wheels-osx.sh b/travis/build-wheels-osx.sh index 4da9dabc..cd4ae86a 100644 --- a/travis/build-wheels-osx.sh +++ b/travis/build-wheels-osx.sh @@ -6,6 +6,10 @@ export PYTHON_VERSION=${MB_PYTHON_VERSION/./} echo 'MB_PYTHON_VERSION: ' $MB_PYTHON_VERSION echo 'PYTHON_VERSION: '$PYTHON_VERSION +echo 'PIP and brew installs' + +pip install -r $BUILD_DEPENDS + echo 'Config make' cd opencv From deae86d26652f4807afb0e72007720ab2e2819e1 Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Wed, 29 Mar 2017 08:56:48 +0200 Subject: [PATCH 12/14] Facepalm --- travis/build-wheels-osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/build-wheels-osx.sh b/travis/build-wheels-osx.sh index cd4ae86a..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 $BUILD_DEPENDS +pip install $BUILD_DEPENDS echo 'Config make' From eef49b063582f08d5be0e33c6817ed052e42ba38 Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Wed, 29 Mar 2017 17:14:29 +0200 Subject: [PATCH 13/14] Drop numpy required version to 1.11.1 For Pythons that aren't 3.6 --- appveyor.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f784eceb..923d96a7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,32 +10,32 @@ environment: BUILD_ENV: "Visual Studio 14" BUILD_DIR: "build" PYTHON_VERSION: "2.7" - NP_VERSION: "1.11.3" + 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.3" + NP_VERSION: "1.11.1" - PYTHON: "C:/Python34" BUILD_ENV: "Visual Studio 14" BUILD_DIR: "build" PYTHON_VERSION: "3.4" - NP_VERSION: "1.11.3" + 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.3" + NP_VERSION: "1.11.1" - PYTHON: "C:/Python35" BUILD_ENV: "Visual Studio 14" BUILD_DIR: "build" PYTHON_VERSION: "3.5" - NP_VERSION: "1.11.3" + 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.3" + NP_VERSION: "1.11.1" - PYTHON: "C:/Python36" BUILD_ENV: "Visual Studio 14" BUILD_DIR: "build" From fabb6b97dce49af2e962f038bf3ee49e877fd4c3 Mon Sep 17 00:00:00 2001 From: Adrian Moisey Date: Wed, 29 Mar 2017 17:15:13 +0200 Subject: [PATCH 14/14] Make sure that the test depends match the build depends --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 209ac0b1..c3b8d548 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,12 +90,14 @@ matrix: - 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