Commit 40e1f76a authored by Hugo's avatar Hugo
Browse files

OSX -> macOS

parent f8b6cc7c
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
Utilities for building on Travis CI and AppVeyor Utilities for building on Travis CI and AppVeyor
################################################ ################################################
A set of scripts to automate builds of OSX and Manylinux1 wheels on the A set of scripts to automate builds of macOS and Manylinux1 wheels on the
`Travis-CI <https://travis-ci.org/>`_ infrastructure, and also Windows `Travis-CI <https://travis-ci.org/>`_ infrastructure, and also Windows
wheels on the `AppVeyor <https://ci.appveyor.com/>`_ infrastructure. wheels on the `AppVeyor <https://ci.appveyor.com/>`_ infrastructure.
The TravisCI scripts are designed to build *and test*: The TravisCI scripts are designed to build *and test*:
* Dual architecture OSX wheels; * Dual architecture macOS wheels;
* 64-bit ``manylinux1_x86_64`` wheels, both narrow and wide Unicode builds; * 64-bit ``manylinux1_x86_64`` wheels, both narrow and wide Unicode builds;
* 32-bit ``manylinux1_i686`` wheels, both narrow and wide Unicode builds. * 32-bit ``manylinux1_i686`` wheels, both narrow and wide Unicode builds.
...@@ -38,8 +38,8 @@ function. ...@@ -38,8 +38,8 @@ function.
The bash scripts are layered, in the sense that they loaded in the following The bash scripts are layered, in the sense that they loaded in the following
sequence: sequence:
OSX macOS
=== =====
See ``multibuild/travis_osx_steps.sh``. See ``multibuild/travis_osx_steps.sh``.
...@@ -56,7 +56,7 @@ functions and variables in earlier scripts: ...@@ -56,7 +56,7 @@ functions and variables in earlier scripts:
See ``travis_osx_steps.sh`` to review source order. See ``travis_osx_steps.sh`` to review source order.
The OSX build / test and phase are on the OSX VM started by travis-ci. The macOS build / test and phase are on the macOS VM started by travis-ci.
Therefore any environment variable defined in the ``.travis.yml`` or bash Therefore any environment variable defined in the ``.travis.yml`` or bash
shell scripts listed above are available for your build and test. shell scripts listed above are available for your build and test.
...@@ -120,7 +120,7 @@ Standard build and test functions ...@@ -120,7 +120,7 @@ Standard build and test functions
********************************* *********************************
The standard build command is ``build_wheel``. This is a bash function. By The standard build command is ``build_wheel``. This is a bash function. By
default the function that is run on OSX, and in the Manylinux container for default the function that is run on macOS, and in the Manylinux container for
the build phase, is defined in ``multibuild/common_utils.sh``. You can the build phase, is defined in ``multibuild/common_utils.sh``. You can
override the default function in the project ``config.sh`` file (see below). override the default function in the project ``config.sh`` file (see below).
...@@ -136,7 +136,7 @@ defined, before building the wheel, so ``pre_build`` is a good place to build ...@@ -136,7 +136,7 @@ defined, before building the wheel, so ``pre_build`` is a good place to build
any required libraries. any required libraries.
The standard test command is the bash function ``install_run``. The version The standard test command is the bash function ``install_run``. The version
run on OSX and in the Linux testing container is also defined in run on macOS and in the Linux testing container is also defined in
``multibuild/common_utils.sh``. Typically, you do not override this function, ``multibuild/common_utils.sh``. Typically, you do not override this function,
but you in that case you will need to define a ``run_tests`` function, to run but you in that case you will need to define a ``run_tests`` function, to run
your tests, returning a non-zero error code for failure. The default your tests, returning a non-zero error code for failure. The default
...@@ -306,7 +306,7 @@ To use these scripts ...@@ -306,7 +306,7 @@ To use these scripts
You also need this file to specify how to run your tests:: You also need this file to specify how to run your tests::
# Define custom utilities # Define custom utilities
# Test for OSX with [ -n "$IS_OSX" ] # Test for macOS with [ -n "$IS_OSX" ]
function pre_build { function pre_build {
# Any stuff that you need to do before you start building the wheels # Any stuff that you need to do before you start building the wheels
...@@ -369,7 +369,7 @@ Here are some simple example projects: ...@@ -369,7 +369,7 @@ Here are some simple example projects:
* https://github.com/MacPython/dipy-wheels * https://github.com/MacPython/dipy-wheels
Less simple projects where there are some serious build dependencies, and / or Less simple projects where there are some serious build dependencies, and / or
OSX / Linux differences: macOS / Linux differences:
* https://github.com/MacPython/matplotlib-wheels * https://github.com/MacPython/matplotlib-wheels
* https://github.com/python-pillow/Pillow-wheels * https://github.com/python-pillow/Pillow-wheels
......
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