8000 Adapt to new Python 3.5 / numpy 1.10 dependencies · MacPython/matplotlib-wheels@eb3e204 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Apr 16, 2021. It is now read-only.

Commit eb3e204

Browse files
matthew-brettmatthew-brett
committed
Adapt to new Python 3.5 / numpy 1.10 dependencies
1 parent 8d38408 commit eb3e204

File tree

2 files changed

+3
-61
lines changed

2 files changed

+3
-61
lines changed

‎.travis.yml

Lines changed: 2 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ env:
88
- TEST_DEPENDS=
99
- PLAT=x86_64
1010
- UNICODE_WIDTH=32
11-
- NP_BUILD_DEP=1.7.1
12-
- NP_TEST_DEP=1.11.0
11+
- NP_BUILD_DEP=1.10.0
12+
- NP_TEST_DEP=1.11.3
1313
- MANYLINUX_URL=https://nipy.bic.berkeley.edu/manylinux
1414
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker
1515
# Following generated with
@@ -31,31 +31,6 @@ matrix:
3131
# Exclude the default Python 3.5 build
3232
- python: 3.5
3333
include:
34-
- os: linux
35-
env:
36-
- MB_PYTHON_VERSION=2.7
37-
- os: linux
38-
env:
39-
- MB_PYTHON_VERSION=2.7
40-
- UNICODE_WIDTH=16
41-
- os: linux
42-
env:
43-
- MB_PYTHON_VERSION=2.7
44-
- PLAT=i686
45-
- os: linux
46-
env:
47-
- MB_PYTHON_VERSION=2.7
48-
- PLAT=i686
49-
- UNICODE_WIDTH=16
50-
- os: linux
51-
env:
52-
- MB_PYTHON_VERSION=3.4
53-
- NP_BUILD_DEP="1.7.1"
54-
- os: linux
55-
env:
56-
- MB_PYTHON_VERSION=3.4
57-
- PLAT=i686
58-
- NP_BUILD_DEP="1.7.1"
5934
- os: linux
6035
env:
6136
- MB_PYTHON_VERSION=3.5
@@ -64,53 +39,22 @@ matrix:
6439
env:
6540
- MB_PYTHON_VERSION=3.5
6641
- PLAT=i686
67-
- NP_BUILD_DEP="1.9.3"
6842
- os: linux
6943
env:
7044
- MB_PYTHON_VERSION=3.6
71-
- NP_BUILD_DEP="1.11.3"
72-
- NP_TEST_DEP="1.11.3"
7345
- os: linux
7446
env:
7547
- MB_PYTHON_VERSION=3.6
7648
- PLAT=i686
77-
- NP_BUILD_DEP="1.11.3"
78-
- NP_TEST_DEP="1.11.3"
79-
- os: osx
80-
language: generic
81-
env:
82-
- MB_PYTHON_VERSION=2.7
83-
- os: osx
84-
language: generic
85-
env:
86-
- MB_PYTHON_VERSION=3.4
87-
- NP_BUILD_DEP="1.7.1"
8849
- os: osx
8950
language: generic
9051
env:
9152
- MB_PYTHON_VERSION=3.5
92-
- NP_BUILD_DEP="1.9.3"
9353
- os: osx
9454
language: generic
9555
env:
9656
- MB_PYTHON_VERSION=3.6
97-
- NP_BUILD_DEP="1.11.3"
98-
- NP_TEST_DEP="1.11.3"
9957
allow_failures:
100-
- os: linux
101-
env:
102-
- MB_PYTHON_VERSION=2.7
103-
- PLAT=i686
104-
- os: linux
105-
env:
106-
- MB_PYTHON_VERSION=2.7
107-
- PLAT=i686
108-
- UNICODE_WIDTH=16
109-
- os: linux
110-
env:
111-
- MB_PYTHON_VERSION=3.4
112-
- PLAT=i686
113-
- NP_BUILD_DEP="1.7.1"
11458
- os: linux
11559
env:
11660
- MB_PYTHON_VERSION=3.5
@@ -120,8 +64,6 @@ matrix:
12064
env:
12165
- MB_PYTHON_VERSION=3.6
12266
- PLAT=i686
123-
- NP_BUILD_DEP="1.11.3"
124-
- NP_TEST_DEP="1.11.3"
12567

12668
before_install:
12769
# See:

‎multibuild

0 commit comments

Comments
 (0)
0