8000 Relax numpy version requirements (#30) · NaxAlpha/opencv-python@caae056 · GitHub
[go: up one dir, main page]
Skip to content

Commit caae056

Browse files
adrianmoiseyskvark
adrianmoisey
authored and
skvark
committed
Relax numpy version requirements (opencv#30)
* Relax numpy version requirements * trying to make apt-get happy * Remove requirements.txt installation This installs numpy, which now comes from travis.yml * Move numpy's dependency to appveyer * Install numpy on OSX * Drop numpy required version to 1.11.1 for Pythons that aren't 3.6 * Make sure that the test depends match the build depends
1 parent be374d3 commit caae056

File tree

6 files changed

+21
-7
lines changed

6 files changed

+21
-7
lines changed

‎.travis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ env:
44
# Commit from opencv that you want to build
55
- BUILD_COMMIT=70bbf17b133496bd7d54d034b0f94bd869e0e810
66
# pip dependencies to _build_ your project
7-
- BUILD_DEPENDS="numpy>=1.11.1"
7+
- BUILD_DEPENDS="numpy==1.11.1"
88
# pip dependencies to _test_ your project. Include any dependencies
99
# that you need, that are also specified in BUILD_DEPENDS, this will be
1010
# a separate install.
11-
- TEST_DEPENDS="numpy>=1.11.1"
11+
- TEST_DEPENDS="numpy==1.11.1"
1212
- PLAT=x86_64
1313
- UNICODE_WIDTH=32
1414
- secure: "mU040XIYWtDjRms27deQy5fNg9HBFF9fiLfSteBaMjopZKXFUBsdMTKYGEVvX8DA879guMdjG8Prw1aCFhTTYlWgJ0Afm4YucRC0vAD4HLNhqLJ2lIpRceR3+2qPX+Oz5ATVVRi3ghBeJ20LLtNgOgf6esQVjdrYNC+YqmguClHKEYAxS7ngW42iQP8HX2anRcz9q9H7exZ9fX/D1PJfMNka/mNaB5KXZu5zdLuk/E0VbWU2tMWVIDUvx4uBlpE1d8HixEV5LHnuVE/QI36BcyucYxstTNKW6pGYgrhkYf+0PX4BphZXwY7EUBwzXsYLmyge6yH8W6NfvTW0ZasFF6xzQc9bsj+gAZN7H+hN2a42VQqIpkoJw9sU0hqzCOQf6ZvWUQgwFdAHJRHqe/zk4456WxnF0kAgbZdKaGOl0/n0WvgHNqD5bgO8Zzb1XyJTKoR+eAtYKXuz3KgpxKvZMMQVr8wMlI1cFEuGjIm+7ZrYB5jPvQrVzV/DgOq4gkPHOjjhu478UFlhGA9/XWwcyidC3b7zuBN2E7xVuTMlKdk7URB3AHXfG5bZgUG80vllQDGXQDpHVnv4Qi8bGCzI4iKTpp4fCibbqxFLxW1jhjmgePseGcie7Avpe+zXznkbmM2BqMCu3QRmtmFL3eCifwMf3rCNlAs0Sd3iLmEvyos="
@@ -89,11 +89,15 @@ matrix:
8989
env:
9090
- MB_PYTHON_VERSION=3.6
9191
- DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
92+
- BUILD_DEPENDS=numpy==1.11.3
93+
- TEST_DEPENDS=numpy==1.11.3
9294
- os: linux
9395
env:
9496
- MB_PYTHON_VERSION=3.6
9597
- DOCKER_IMAGE=quay.io/pypa/manylinux1_i686
9698
- PLAT=i686
99+
- BUILD_DEPENDS=numpy==1.11.3
100+
- TEST_DEPENDS=numpy==1.11.3
97101

98102
before_install:
99103
- source multibuild/common_utils.sh
@@ -112,4 +116,4 @@ script:
112116
after_success:
113117
# Upload wheels to pypi
114118
- pip install twine
115-
- 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
119+
- 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

‎appveyor.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,42 @@ environment:
1010
BUILD_ENV: "Visual Studio 14"
1111
BUILD_DIR: "build"
1212
PYTHON_VERSION: "2.7"
13+
NP_VERSION: "1.11.1"
1314
- PYTHON: "C:/Python27-x64"
1415
BUILD_ENV: "Visual Studio 14 Win64"
1516
BUILD_DIR: "build64"
1617
PYTHON_VERSION: "2.7"
18+
NP_VERSION: "1.11.1"
1719
- PYTHON: "C:/Python34"
1820
BUILD_ENV: "Visual Studio 14"
1921
BUILD_DIR: "build"
2022
PYTHON_VERSION: "3.4"
23+
NP_VERSION: "1.11.1"
2124
- PYTHON: "C:/Python34-x64"
2225
BUILD_ENV: "Visual Studio 14 Win64"
2326
BUILD_DIR: "build64"
2427
PYTHON_VERSION: "3.4"
28+
NP_VERSION: "1.11.1"
2529
- PYTHON: "C:/Python35"
2630
BUILD_ENV: "Visual Studio 14"
2731
BUILD_DIR: "build"
2832
PYTHON_VERSION: "3.5"
33+
NP_VERSION: "1.11.1"
2934
- PYTHON: "C:/Python35-x64"
3035
BUILD_ENV: "Visual Studio 14 Win64"
3136
BUILD_DIR: "build64"
3237
PYTHON_VERSION: "3.5"
38+
NP_VERSION: "1.11.1"
3339
- PYTHON: "C:/Python36"
3440
BUILD_ENV: "Visual Studio 14"
3541
BUILD_DIR: "build"
3642
PYTHON_VERSION: "3.6"
43+
NP_VERSION: "1.11.3"
3744
- PYTHON: "C:/Python36-x64"
3845
BUILD_ENV: "Visual Studio 14 Win64"
3946
BUILD_DIR: "build64"
4047
PYTHON_VERSION: "3.6"
48+
NP_VERSION: "1.11.3"
4149

4250
install:
4351
- cmd: >-
@@ -50,6 +58,8 @@ install:
5058
5159
"%PYTHON%/python.exe" -m pip install -r requirements.txt
5260
61+
"%PYTHON%/python.exe" -m pip install "numpy==%NP_VERSION%"
62+
5363
build_script:
5464
- cmd: |-
5565

‎config.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ function run_tests {
4141
source ../travis/test-wheels.sh
4242
else
4343
echo "Running for linux"
44-
apt-get -y install libglib2.0-0
44+
apt-get update
45+
apt-get -y install --fix-missing libglib2.0-0
4546
cd /io/tests/
4647
source /io/travis/test-wheels.sh
4748
fi

‎requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
numpy>=1.11.1
21
wheel
32
twine

‎travis/build-wheels-osx.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ echo 'PYTHON_VERSION: '$PYTHON_VERSION
88

99
echo 'PIP and brew installs'
1010

11-
pip install -r requirements.txt
11+
pip install $BUILD_DEPENDS
1212

1313
echo 'Config make'
1414

‎travis/build-wheels.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
1111
echo 'PWD : '$PWD
1212
echo 'PYBIN: '$PYBIN
1313

14-
$PYBIN/pip install -r requirements.txt
14+
$PYBIN/pip install $BUILD_DEPENDS
1515

1616
# Begin build
1717
echo 'Begin build'

0 commit comments

Comments
 (0)
0