Skip to content

Relax numpy version requirements #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 30, 2017
Merged

Relax numpy version requirements #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cc42fde
Relax numpy version requirements
adrianmoisey Mar 27, 2017
459a924
Try relax numpy dependencies
adrianmoisey Mar 27, 2017
1a61a4f
trying to make apt-get happy
skvark Mar 26, 2017
4957c49
Remove requirements.txt installation
adrianmoisey Mar 28, 2017
647c5b6
Move numpy's dependency to appveyer
adrianmoisey Mar 28, 2017
8a2e1ac
Try quoting this
adrianmoisey Mar 28, 2017
a6cfacb
Debug
adrianmoisey Mar 28, 2017
3c37234
Needed some whitespace
adrianmoisey Mar 28, 2017
1401931
Debug
adrianmoisey Mar 28, 2017
9611322
facepalm
adrianmoisey Mar 28, 2017
765f3eb
Install numpy on OSX
adrianmoisey Mar 29, 2017
deae86d
Facepalm
adrianmoisey Mar 29, 2017
eef49b0
Drop numpy required version to 1.11.1
adrianmoisey Mar 29, 2017
fabb6b9
Make sure that the test depends match the build depends
adrianmoisey Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="
Expand Down Expand Up @@ -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
Expand All @@ -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
- 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
10 changes: 10 additions & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
Expand All @@ -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: |-

Expand Down
3 changes: 2 additions & 1 deletion config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
numpy>=1.11.1
wheel
twine
2 changes: 1 addition & 1 deletion travis/build-wheels-osx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion travis/build-wheels.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down