Commit 27dc9a4c authored by Rob Buckley's avatar Rob Buckley
Browse files

cosmetic: clarify some comments, update readme

parent 541d27cb
......@@ -8,7 +8,8 @@ wheels on the `AppVeyor <https://ci.appveyor.com/>`_ infrastructure.
The Travis CI scripts are designed to build *and test*:
* Dual architecture macOS wheels;
* Dual 32/64-bit architecture macOS wheels built for macOS 10.6+;
* 64-bit macOS wheels built for macOS 10.9+;
* 64-bit ``manylinux1_x86_64`` wheels, both narrow and wide Unicode builds;
* 32-bit ``manylinux1_i686`` wheels, both narrow and wide Unicode builds.
......@@ -238,6 +239,10 @@ To use these scripts
language: generic
env:
- MB_PYTHON_VERSION=2.7
- os: osx
env:
- MB_PYTHON_VERSION=2.7
- MB_PYTHON_OSX_VER=10.9
- os: osx
language: generic
env:
......@@ -250,6 +255,22 @@ To use these scripts
language: generic
env:
- MB_PYTHON_VERSION=3.6
- os: osx
language: generic
env:
- MB_PYTHON_VERSION=3.6
- os: osx
language: generic
env:
- MB_PYTHON_VERSION=3.6
- MB_PYTHON_OSX_VER=10.9
# Default OSX (xcode image) is 10.13 (xcode 9.4.1) as of 2018-08-03
# See: https://docs.travis-ci.com/user/reference/osx/
- os: osx
osx_image: xcode10.1
env:
- PYTHON_VERSION=3.7
- MB_PYTHON_OSX_VER=10.9
- os: osx
language: generic
env:
......
......@@ -305,16 +305,17 @@ function repair_wheelhouse {
install_delocate
delocate-wheel $wheelhouse/*.whl # copies library dependencies into wheel
# Add platform tags to label wheels as compatible with OSX 10.9 and
# 10.10. The wheels will be built against Python.org Python, and so will
# in fact be compatible with OSX >= 10.6 or >=10.9. pip < 6.0 doesn't realize
# this, so, in case users have older pip, add platform tags to specify
# compatibility with later OSX. Not necessary for OSX released well
# after pip 6.0. See:
# 10.10. The wheels are built against Python.org Python, and so will
# in fact be compatible with either 10.6+ or 10.9+, depending on the value
# of MB_PYTHON_OSX_VER. pip < 6.0 doesn't realize this, so, in case users
# have older pip, add platform tags to specify compatibility with later OSX.
# Not necessary for OSX released well after pip 6.0. See:
# https://github.com/MacPython/wiki/wiki/Spinning-wheels#question-will-pip-give-me-a-broken-wheel
if [ $MB_PYTHON_OSX_VER == "10.6" ]; then
# assume that 10.6-based python is dual arch (32/64-bit)
delocate-addplat --rm-orig -x 10_9 -x 10_10 $wheelhouse/*.whl
elif [ $MB_PYTHON_OSX_VER == "10.9" ]; then
# assume that 10.9 python is 64-bit arch only
# assume that 10.9-based python is 64-bit arch only
delocate-addplat --rm-orig -p macosx_10_10_x86_64 $wheelhouse/*.whl
else
echo "Invalid python macosx version $MB_PYTHON_OSX_VER" 1>&2
......
......@@ -8,6 +8,7 @@ source tests/test_common_utils.sh
source tests/test_fill_submodule.sh
if [ -n "$IS_OSX" ]; then
source osx_utils.sh
# osx_utils defines MACPYTHON_DEFAULT_OSX
MB_PYTHON_OSX_VER=${MB_PYTHON_OSX_VER:-$MACPYTHON_DEFAULT_OSX}
get_macpython_environment $PYTHON_VERSION $MB_PYTHON_OSX_VER $VENV
source tests/test_python_install.sh
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment