Skip to content

Commit 27dc9a4

Browse files
committed
cosmetic: clarify some comments, update readme
1 parent 541d27c commit 27dc9a4

File tree

3 files changed

+30
-7
lines changed

3 files changed

+30
-7
lines changed

README.rst

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ wheels on the `AppVeyor <https://ci.appveyor.com/>`_ infrastructure.
88

99
The Travis CI scripts are designed to build *and test*:
1010

11-
* Dual architecture macOS wheels;
11+
* Dual 32/64-bit architecture macOS wheels built for macOS 10.6+;
12+
* 64-bit macOS wheels built for macOS 10.9+;
1213
* 64-bit ``manylinux1_x86_64`` wheels, both narrow and wide Unicode builds;
1314
* 32-bit ``manylinux1_i686`` wheels, both narrow and wide Unicode builds.
1415

@@ -238,6 +239,10 @@ To use these scripts
238239
language: generic
239240
env:
240241
- MB_PYTHON_VERSION=2.7
242+
- os: osx
243+
env:
244+
- MB_PYTHON_VERSION=2.7
245+
- MB_PYTHON_OSX_VER=10.9
241246
- os: osx
242247
language: generic
243248
env:
@@ -250,6 +255,22 @@ To use these scripts
250255
language: generic
251256
env:
252257
- MB_PYTHON_VERSION=3.6
258+
- os: osx
259+
language: generic
260+
env:
261+
- MB_PYTHON_VERSION=3.6
262+
- os: osx
263+
language: generic
264+
env:
265+
- MB_PYTHON_VERSION=3.6
266+
- MB_PYTHON_OSX_VER=10.9
267+
# Default OSX (xcode image) is 10.13 (xcode 9.4.1) as of 2018-08-03
268+
# See: https://docs.travis-ci.com/user/reference/osx/
269+
- os: osx
270+
osx_image: xcode10.1
271+
env:
272+
- PYTHON_VERSION=3.7
273+
- MB_PYTHON_OSX_VER=10.9
253274
- os: osx
254275
language: generic
255276
env:

osx_utils.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,16 +305,17 @@ function repair_wheelhouse {
305305
install_delocate
306306
delocate-wheel $wheelhouse/*.whl # copies library dependencies into wheel
307307
# Add platform tags to label wheels as compatible with OSX 10.9 and
308-
# 10.10. The wheels will be built against Python.org Python, and so will
309-
# in fact be compatible with OSX >= 10.6 or >=10.9. pip < 6.0 doesn't realize
310-
# this, so, in case users have older pip, add platform tags to specify
311-
# compatibility with later OSX. Not necessary for OSX released well
312-
# after pip 6.0. See:
308+
# 10.10. The wheels are built against Python.org Python, and so will
309+
# in fact be compatible with either 10.6+ or 10.9+, depending on the value
310+
# of MB_PYTHON_OSX_VER. pip < 6.0 doesn't realize this, so, in case users
311+
# have older pip, add platform tags to specify compatibility with later OSX.
312+
# Not necessary for OSX released well after pip 6.0. See:
313313
# https://github.com/MacPython/wiki/wiki/Spinning-wheels#question-will-pip-give-me-a-broken-wheel
314314
if [ $MB_PYTHON_OSX_VER == "10.6" ]; then
315+
# assume that 10.6-based python is dual arch (32/64-bit)
315316
delocate-addplat --rm-orig -x 10_9 -x 10_10 $wheelhouse/*.whl
316317
elif [ $MB_PYTHON_OSX_VER == "10.9" ]; then
317-
# assume that 10.9 python is 64-bit arch only
318+
# assume that 10.9-based python is 64-bit arch only
318319
delocate-addplat --rm-orig -p macosx_10_10_x86_64 $wheelhouse/*.whl
319320
else
320321
echo "Invalid python macosx version $MB_PYTHON_OSX_VER" 1>&2

tests/test_multibuild.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ source tests/test_common_utils.sh
88
source tests/test_fill_submodule.sh
99
if [ -n "$IS_OSX" ]; then
1010
source osx_utils.sh
11+
# osx_utils defines MACPYTHON_DEFAULT_OSX
1112
MB_PYTHON_OSX_VER=${MB_PYTHON_OSX_VER:-$MACPYTHON_DEFAULT_OSX}
1213
get_macpython_environment $PYTHON_VERSION $MB_PYTHON_OSX_VER $VENV
1314
source tests/test_python_install.sh

0 commit comments

Comments
 (0)