10000 New multibuild refactor; document OSX check · MacPython/matplotlib-wheels@1ef65d6 · 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 1ef65d6

Browse files
matthew-brettmatthew-brett
committed
New multibuild refactor; document OSX check
1 parent cfe9e4f commit 1ef65d6

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

‎.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ env:
77
- PLAT=x86_64
88
- UNICODE_WIDTH=32
99
- NP_BUILD_DEP=1.6.2
10-
# Needed for Python 3.5 numpy wheels on OSX (as well as manylinux
11-
# wheels) (see https://github.com/numpy/numpy/issues/7755)
1210
- MANYLINUX_URL=https://nipy.bic.berkeley.edu/manylinux
1311
- WHEELHOUSE_UPLOADER_USERNAME=travis-worker
1412
# Following generated with
@@ -41,12 +39,12 @@ matrix:
4139
- os: linux
4240
python: 3.4
4341
env:
44-
- NP_BUILD_DEP="1.7.2"
42+
- NP_BUILD_DEP="1.7.1"
4543
- os: linux
4644
python: 3.4
4745
env:
4846
- PLAT=i686
49-
- NP_BUILD_DEP="1.7.2"
47+
- NP_BUILD_DEP="1.7.1"
5048
- os: linux
5149
python: 3.5
5250
env:
@@ -64,7 +62,7 @@ matrix:
6462
language: objective-c
6563
env:
6664
- TRAVIS_PYTHON_VERSION=3.4
67-
- NP_BUILD_DEP="1.7.2"
65+
- NP_BUILD_DEP="1.7.1"
6866
- os: osx
6967
language: objective-c
7068
env:

‎config.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Define custom utilities
2-
if [ "$TRAVIS_OS_NAME" == "osx" ]; then IS_OSX=1; fi
2+
# Test for OSX with [ -n "$IS_OSX" ]
33

44
function pre_build {
55
# Any stuff that you need to do before you start building the wheels
@@ -11,7 +11,7 @@ function pre_build {
1111
fi
1212
# Use local freetype for versions which support it
1313
export MPLLOCALFREETYPE=1
14-
source multibuild/docker_lib_builders.sh
14+
source multibuild/library_builders.sh
1515
build_jpeg
1616
build_libpng
1717
build_bzip2

‎multibuild

0 commit comments

Comments
 (0)
0