From e4a917f717e90ee17cc48f20fcffa9aae96895a3 Mon Sep 17 00:00:00 2001
From: Joe Rickerby <joerick@mac.com>
Date: Mon, 24 May 2021 19:05:56 +0100
Subject: [PATCH] Revert "Remove travis-ci macOS from docs/examples"

This reverts commit 5de574d36820c2481f4e7557ed6aa0e431ee3e63.
---
 CI.md                                  | 13 +++++++------
 README.md                              |  2 +-
 docs/setup.md                          |  4 ++--
 examples/travis-ci-deploy.yml          |  3 +++
 examples/travis-ci-minimal.yml         |  3 +++
 examples/travis-ci-test-and-deploy.yml | 10 ++++++++++
 6 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/CI.md b/CI.md
index 8ac4ada5..6d6a8356 100644
--- a/CI.md
+++ b/CI.md
@@ -1,11 +1,12 @@
 This is a summary of the Python versions and platforms covered by the different CI platforms:
 
-|          | 3.6                          | 3.7                         | 3.8              |
-|----------|------------------------------|-----------------------------|------------------|
-| Linux    | Travis CI / CircleCI         | AppVeyor¹ / GitHub Actions  | Azure Pipelines  |
-| macOS    | CircleCI                     | AppVeyor¹ / GitHub Actions  | Azure Pipelines  |
-| Windows  | Travis CI / Azure Pipelines  | AppVeyor¹ / GitHub Actions  | Azure Pipelines  |
+|          | 3.6                          | 3.7                                      | 3.8              |
+|----------|------------------------------|------------------------------------------|------------------|
+| Linux    | Travis CI / CircleCI         | AppVeyor² / GitHub Actions               | Azure Pipelines  |
+| macOS    | CircleCI                     | AppVeyor² / Travis CI¹ / GitHub Actions  | Azure Pipelines  |
+| Windows  | Travis CI / Azure Pipelines  | AppVeyor² / GitHub Actions               | Azure Pipelines  |
 
-> ¹ AppVeyor only runs the "basic" test to reduce load.
+> ¹ Python version not really pinned, but dependent on the (default) version of image used.
+> ² AppVeyor only runs the "basic" test to reduce load.
 
 Non-x86 architectures are covered on Travis CI using Python 3.6.
diff --git a/README.md b/README.md
index de9f4e04..9592a5ea 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Usage
 |-----------------|-------|-------|---------|--------------|
 | GitHub Actions  | ✅    | ✅    | ✅      | ✅¹           |
 | Azure Pipelines | ✅    | ✅    | ✅      |              |
-| Travis CI       | ✅    |       | ✅      | ✅           |
+| Travis CI       | ✅    | ✅    | ✅      | ✅           |
 | AppVeyor        | ✅    | ✅    | ✅      |              |
 | CircleCI        | ✅    | ✅    |         |              |
 | Gitlab CI       | ✅    |       |         |              |
diff --git a/docs/setup.md b/docs/setup.md
index 1f67990a..86971cdc 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -116,9 +116,9 @@ Commit this file, enable building of your repo on Azure Pipelines, and push.
 
 Wheels will be stored for you and available through the Pipelines interface. For more info on this file, check out the [docs](https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema).
 
-# Travis CI [linux/windows] {: #travis-ci}
+# Travis CI [linux/mac/windows] {: #travis-ci}
 
-To build Linux and Windows wheels on Travis CI, create a `.travis.yml` file in your repo.
+To build Linux, Mac, and Windows wheels on Travis CI, create a `.travis.yml` file in your repo.
 
 > .travis.yml
 
diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml
index 8591dac5..8a3b424e 100644
--- a/examples/travis-ci-deploy.yml
+++ b/examples/travis-ci-deploy.yml
@@ -9,6 +9,9 @@ jobs:
   include:
     # perform a linux build
     - services: docker
+    # and a mac build
+    - os: osx
+      language: shell
     # and a windows build
     - os: windows
       language: shell
diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml
index 6ae08391..1cf27990 100644
--- a/examples/travis-ci-minimal.yml
+++ b/examples/travis-ci-minimal.yml
@@ -15,6 +15,9 @@ jobs:
     # perform a linux S390X build
     - services: docker
       arch: s390x
+    # and a mac build
+    - os: osx
+      language: shell
     # and a windows build
     - os: windows
       language: shell
diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml
index 9bdcaa03..a429ce70 100644
--- a/examples/travis-ci-test-and-deploy.yml
+++ b/examples/travis-ci-test-and-deploy.yml
@@ -62,6 +62,16 @@ jobs:
       after_success: |
         python3 -m pip install twine
         python3 -m twine upload --skip-existing wheelhouse/*.whl
+    # Deploy on mac
+    - stage: deploy
+      name: Build and deploy macOS wheels
+      os: osx
+      language: shell
+      install: python3 -m pip install cibuildwheel==1.11.0
+      script: python3 -m cibuildwheel --output-dir wheelhouse
+      after_success: |
+        python3 -m pip install twine
+        python3 -m twine upload --skip-existing wheelhouse/*.whl
     # Deploy on windows
     - stage: deploy
       name: Build and deploy Windows wheels