From 814eccabe3ac4aa4347817bbed0a46d95ba400a6 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Sat, 11 Mar 2017 11:01:10 +0100
Subject: [PATCH 01/32] First attempt to automatically deploy on PyPI

---
 .travis.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index b50cc7a..afbb7c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,3 +5,16 @@ python:
   - "3.6"
 install: "pip install -r requirements-test.txt"
 script: "py.test ./tests"
+
+deploy:
+  # test pypi
+  - provider: pypi
+    server: https://testpypi.python.org/pypi
+    user: "lelit"
+    password:
+      secure: "qbxFqpCW/3ygk+cEbX5vbB0Cin/8XFOTF5Z9LgC8UPYbJHPvLZwhPxHpW1IW/gPk6ukCDi5ZPBvBLjTGPjtWQAL4leH1A0Ei/Z5z3S00ZZsTjfSDTuA/jk0fTcnTmS7L2P0DtfkBshJrf+k+lr37bVYFbiPtV6uBDBSlCbQeZ5BE43CShOCguNXtV82Z/s9Rk9uynjBivOJRRiI9v8SBz3xYLJKTNSyoKf1lRYtW6cxKWN5zJDm8hXTtDFC7uTCKeCWS6CDILxqSsGlE85j3AUmg2NySxpespTbqsAu0B4N+9A38wq7Rxpd8VoYtuxf96Xj66Ze/JzjBMRJQSpgti5QVKWWN+8LAxzpLxZXgjVjsHASUITPow3aVqyK4lQxVzkUINEo16JlMptcV/XbdiLw07C8Q3Om0ZmWPc+0T2M27T0N395lXtQXSMhZ4pmHpIEG/rQc52FczFR9O3Mkp00NRk1DyCxPOVQl/VkrXn8FTuK4onAjLttojfa32rM6BTUE8Nk5/XaKtBGx26Do9ipIdNt3y77VqeM7hmviSWmXs8w1u+2xc9XlPG/ZLh4LpZa1iCLhymwFhxbnwVVzCpS2DPrRSFYvJIH5VY0pd1OX6d75hOb2DNjt3WTrPGdjczKwFbt4jRv5YDRU8pNQx4XSm9pP+Ax0+YefdMNHgeCU="
+    distributions: "sdist bdist_wheel"
+    on:
+      repo: python-rapidjson/python-rapidjson
+      branch: pypi
+      tags: false

From f65b649f086e4ee71dee5ab1fa40760e4543a065 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 17:24:00 +0200
Subject: [PATCH 02/32] Second attempt to automatic wheel upload on PyPI, using
 cibuildwheel

---
 .travis.yml | 51 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index afbb7c3..a996d64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,45 @@
+matrix:
+  include:
+    - sudo: required
+      services:
+        - docker
+    - os: osx
+
+env:
+  global:
+    - CIBW_TEST_COMMAND="py.test ./tests"
+    - TWINE_REPOSITORY_URL=https://testpypi.python.org/pypi
+    - TWINE_USERNAME=lelit
+      # Note: TWINE_PASSWORD is set in Travis settings
+
 language: python
 python:
   - "3.4"
   - "3.5"
   - "3.6"
 install: "pip install -r requirements-test.txt"
-script: "py.test ./tests"
+#script: "py.test ./tests"
+
+script:
+  - pip install cibuildwheel==0.3.0
+  - cibuildwheel --output-dir wheelhouse
+  - pip install twine
+  - twine upload wheelhouse/*.whl
+  # - |
+  #   if [[ $TRAVIS_TAG ]]; then
+  #     python -m pip install twine
+  #     python -m twine upload wheelhouse/*.whl
+  #   fi
 
-deploy:
-  # test pypi
-  - provider: pypi
-    server: https://testpypi.python.org/pypi
-    user: "lelit"
-    password:
-      secure: "qbxFqpCW/3ygk+cEbX5vbB0Cin/8XFOTF5Z9LgC8UPYbJHPvLZwhPxHpW1IW/gPk6ukCDi5ZPBvBLjTGPjtWQAL4leH1A0Ei/Z5z3S00ZZsTjfSDTuA/jk0fTcnTmS7L2P0DtfkBshJrf+k+lr37bVYFbiPtV6uBDBSlCbQeZ5BE43CShOCguNXtV82Z/s9Rk9uynjBivOJRRiI9v8SBz3xYLJKTNSyoKf1lRYtW6cxKWN5zJDm8hXTtDFC7uTCKeCWS6CDILxqSsGlE85j3AUmg2NySxpespTbqsAu0B4N+9A38wq7Rxpd8VoYtuxf96Xj66Ze/JzjBMRJQSpgti5QVKWWN+8LAxzpLxZXgjVjsHASUITPow3aVqyK4lQxVzkUINEo16JlMptcV/XbdiLw07C8Q3Om0ZmWPc+0T2M27T0N395lXtQXSMhZ4pmHpIEG/rQc52FczFR9O3Mkp00NRk1DyCxPOVQl/VkrXn8FTuK4onAjLttojfa32rM6BTUE8Nk5/XaKtBGx26Do9ipIdNt3y77VqeM7hmviSWmXs8w1u+2xc9XlPG/ZLh4LpZa1iCLhymwFhxbnwVVzCpS2DPrRSFYvJIH5VY0pd1OX6d75hOb2DNjt3WTrPGdjczKwFbt4jRv5YDRU8pNQx4XSm9pP+Ax0+YefdMNHgeCU="
-    distributions: "sdist bdist_wheel"
-    on:
-      repo: python-rapidjson/python-rapidjson
-      branch: pypi
-      tags: false
+# deploy:
+#   # test pypi
+#   - provider: pypi
+#     server: https://testpypi.python.org/pypi
+#     user: "lelit"
+#     password:
+#       secure: "qbxFqpCW/3ygk+cEbX5vbB0Cin/8XFOTF5Z9LgC8UPYbJHPvLZwhPxHpW1IW/gPk6ukCDi5ZPBvBLjTGPjtWQAL4leH1A0Ei/Z5z3S00ZZsTjfSDTuA/jk0fTcnTmS7L2P0DtfkBshJrf+k+lr37bVYFbiPtV6uBDBSlCbQeZ5BE43CShOCguNXtV82Z/s9Rk9uynjBivOJRRiI9v8SBz3xYLJKTNSyoKf1lRYtW6cxKWN5zJDm8hXTtDFC7uTCKeCWS6CDILxqSsGlE85j3AUmg2NySxpespTbqsAu0B4N+9A38wq7Rxpd8VoYtuxf96Xj66Ze/JzjBMRJQSpgti5QVKWWN+8LAxzpLxZXgjVjsHASUITPow3aVqyK4lQxVzkUINEo16JlMptcV/XbdiLw07C8Q3Om0ZmWPc+0T2M27T0N395lXtQXSMhZ4pmHpIEG/rQc52FczFR9O3Mkp00NRk1DyCxPOVQl/VkrXn8FTuK4onAjLttojfa32rM6BTUE8Nk5/XaKtBGx26Do9ipIdNt3y77VqeM7hmviSWmXs8w1u+2xc9XlPG/ZLh4LpZa1iCLhymwFhxbnwVVzCpS2DPrRSFYvJIH5VY0pd1OX6d75hOb2DNjt3WTrPGdjczKwFbt4jRv5YDRU8pNQx4XSm9pP+Ax0+YefdMNHgeCU="
+#     distributions: "sdist bdist_wheel"
+#     on:
+#       repo: python-rapidjson/python-rapidjson
+#       branch: pypi
+#       tags: false

From 5827aeffe06d18d172a515ed862786b0cc71680f Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 17:39:28 +0200
Subject: [PATCH 03/32] Try different syntax

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a996d64..7033863 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
-matrix:
-  include:
-    - sudo: required
-      services:
-        - docker
-    - os: osx
+sudo: required
+services:
+  - docker
+os:
+  - linux
+  - osx
 
 env:
   global:

From 8b4ee3b52a3de46fd0787f5ce1fcebbf85151bdb Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 17:46:16 +0200
Subject: [PATCH 04/32] Skip Python 2.7 and 3.3

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 7033863..6f526a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ os:
 env:
   global:
     - CIBW_TEST_COMMAND="py.test ./tests"
+    - CIBW_SKIP="cp27* cp33*"
     - TWINE_REPOSITORY_URL=https://testpypi.python.org/pypi
     - TWINE_USERNAME=lelit
       # Note: TWINE_PASSWORD is set in Travis settings

From a14ffa06be3ce637cfb11d3d7797bd82c98770c4 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 17:55:20 +0200
Subject: [PATCH 05/32] Update PyPI URL

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6f526a8..4694a68 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ env:
   global:
     - CIBW_TEST_COMMAND="py.test ./tests"
     - CIBW_SKIP="cp27* cp33*"
-    - TWINE_REPOSITORY_URL=https://testpypi.python.org/pypi
+    - TWINE_REPOSITORY_URL=https://test.pypi.org/legacy
     - TWINE_USERNAME=lelit
       # Note: TWINE_PASSWORD is set in Travis settings
 

From 91596fb4c357d9b710e0d346656fb458d65ba4f2 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 17:55:38 +0200
Subject: [PATCH 06/32] Don't build on MacOS, it exits with an error extracting
 Python 3.x sources

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4694a68..bcc96a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ services:
   - docker
 os:
   - linux
-  - osx
+#  - osx
 
 env:
   global:

From bebfc54048fb9b7c3ea25a795c13b3ae7e33851a Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 18:05:41 +0200
Subject: [PATCH 07/32] Comment out outer level tests

---
 .travis.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bcc96a8..42f1097 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,12 +13,12 @@ env:
     - TWINE_USERNAME=lelit
       # Note: TWINE_PASSWORD is set in Travis settings
 
-language: python
-python:
-  - "3.4"
-  - "3.5"
-  - "3.6"
-install: "pip install -r requirements-test.txt"
+# language: python
+# python:
+#   - "3.4"
+#   - "3.5"
+#   - "3.6"
+# install: "pip install -r requirements-test.txt"
 #script: "py.test ./tests"
 
 script:

From b3d12b65f267cd515ea18287d3bff057a8df7710 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 18:11:45 +0200
Subject: [PATCH 08/32] Run the CI script under Python 3.6 and skip PyPI upload
 for now

---
 .travis.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 42f1097..5876770 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,19 +13,14 @@ env:
     - TWINE_USERNAME=lelit
       # Note: TWINE_PASSWORD is set in Travis settings
 
-# language: python
-# python:
-#   - "3.4"
-#   - "3.5"
-#   - "3.6"
-# install: "pip install -r requirements-test.txt"
-#script: "py.test ./tests"
+language: python
+python: "3.6"
 
 script:
   - pip install cibuildwheel==0.3.0
   - cibuildwheel --output-dir wheelhouse
-  - pip install twine
-  - twine upload wheelhouse/*.whl
+  # - pip install twine
+  # - twine upload wheelhouse/*.whl
   # - |
   #   if [[ $TRAVIS_TAG ]]; then
   #     python -m pip install twine

From b30a8bc156938fc86c1691284fa44f26e6692efd Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 18:23:53 +0200
Subject: [PATCH 09/32] Install tgarc master version of cibuildwheel, fixes Py3
 issues

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5876770..663a3ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ language: python
 python: "3.6"
 
 script:
-  - pip install cibuildwheel==0.3.0
+  - pip install https://github.com/tgarc/cibuildwheel/archive/master.zip
   - cibuildwheel --output-dir wheelhouse
   # - pip install twine
   # - twine upload wheelhouse/*.whl

From b4eff9df2b21acc6b89817d37688d41a63d85742 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 18:28:37 +0200
Subject: [PATCH 10/32] Explicitly install pytest

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 663a3ea..cd4b763 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,7 @@ os:
 
 env:
   global:
+    - CIBW_TEST_REQUIRES="pytest pytz"
     - CIBW_TEST_COMMAND="py.test ./tests"
     - CIBW_SKIP="cp27* cp33*"
     - TWINE_REPOSITORY_URL=https://test.pypi.org/legacy

From 8fb1004b061f507676639f7690d0a383558b24d3 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 18:32:41 +0200
Subject: [PATCH 11/32] Fix tests pathname

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cd4b763..234ac41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ os:
 env:
   global:
     - CIBW_TEST_REQUIRES="pytest pytz"
-    - CIBW_TEST_COMMAND="py.test ./tests"
+    - CIBW_TEST_COMMAND="py.test {project}/tests"
     - CIBW_SKIP="cp27* cp33*"
     - TWINE_REPOSITORY_URL=https://test.pypi.org/legacy
     - TWINE_USERNAME=lelit

From deccb0c22b4f51ffb015dd392a22df916c8f7916 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 18:36:22 +0200
Subject: [PATCH 12/32] Install required pytest-benchmark as well

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 234ac41..779ad8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ os:
 
 env:
   global:
-    - CIBW_TEST_REQUIRES="pytest pytz"
+    - CIBW_TEST_REQUIRES="pytest pytest-benchmark pytz"
     - CIBW_TEST_COMMAND="py.test {project}/tests"
     - CIBW_SKIP="cp27* cp33*"
     - TWINE_REPOSITORY_URL=https://test.pypi.org/legacy

From 4c4dbfcc0a3fa14736ad4f5ebbe7549519c10afa Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 19:11:00 +0200
Subject: [PATCH 13/32] Clean up and reconfigure the matrix

---
 .travis.yml | 40 +++++++++++++---------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 779ad8a..90ef5d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
-sudo: required
-services:
-  - docker
-os:
-  - linux
-#  - osx
+matrix:
+  include:
+    - sudo: required
+      services:
+        - docker
+    - os: osx
 
 env:
   global:
@@ -15,28 +15,14 @@ env:
       # Note: TWINE_PASSWORD is set in Travis settings
 
 language: python
-python: "3.6"
+python:
+  - "3.6"
 
 script:
   - pip install https://github.com/tgarc/cibuildwheel/archive/master.zip
   - cibuildwheel --output-dir wheelhouse
-  # - pip install twine
-  # - twine upload wheelhouse/*.whl
-  # - |
-  #   if [[ $TRAVIS_TAG ]]; then
-  #     python -m pip install twine
-  #     python -m twine upload wheelhouse/*.whl
-  #   fi
-
-# deploy:
-#   # test pypi
-#   - provider: pypi
-#     server: https://testpypi.python.org/pypi
-#     user: "lelit"
-#     password:
-#       secure: "qbxFqpCW/3ygk+cEbX5vbB0Cin/8XFOTF5Z9LgC8UPYbJHPvLZwhPxHpW1IW/gPk6ukCDi5ZPBvBLjTGPjtWQAL4leH1A0Ei/Z5z3S00ZZsTjfSDTuA/jk0fTcnTmS7L2P0DtfkBshJrf+k+lr37bVYFbiPtV6uBDBSlCbQeZ5BE43CShOCguNXtV82Z/s9Rk9uynjBivOJRRiI9v8SBz3xYLJKTNSyoKf1lRYtW6cxKWN5zJDm8hXTtDFC7uTCKeCWS6CDILxqSsGlE85j3AUmg2NySxpespTbqsAu0B4N+9A38wq7Rxpd8VoYtuxf96Xj66Ze/JzjBMRJQSpgti5QVKWWN+8LAxzpLxZXgjVjsHASUITPow3aVqyK4lQxVzkUINEo16JlMptcV/XbdiLw07C8Q3Om0ZmWPc+0T2M27T0N395lXtQXSMhZ4pmHpIEG/rQc52FczFR9O3Mkp00NRk1DyCxPOVQl/VkrXn8FTuK4onAjLttojfa32rM6BTUE8Nk5/XaKtBGx26Do9ipIdNt3y77VqeM7hmviSWmXs8w1u+2xc9XlPG/ZLh4LpZa1iCLhymwFhxbnwVVzCpS2DPrRSFYvJIH5VY0pd1OX6d75hOb2DNjt3WTrPGdjczKwFbt4jRv5YDRU8pNQx4XSm9pP+Ax0+YefdMNHgeCU="
-#     distributions: "sdist bdist_wheel"
-#     on:
-#       repo: python-rapidjson/python-rapidjson
-#       branch: pypi
-#       tags: false
+  - |
+    if [[ $TRAVIS_TAG ]]; then
+      python -m pip install twine
+      python -m twine upload wheelhouse/*.whl
+    fi

From de42e3323bb4a5296ed89409b5cf638890e1adc2 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 19:27:14 +0200
Subject: [PATCH 14/32] Skip also Python 2.6, present in the manylinux1_i686
 Docker image

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 90ef5d8..f909079 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ env:
   global:
     - CIBW_TEST_REQUIRES="pytest pytest-benchmark pytz"
     - CIBW_TEST_COMMAND="py.test {project}/tests"
-    - CIBW_SKIP="cp27* cp33*"
+    - CIBW_SKIP="cp2* cp33*"
     - TWINE_REPOSITORY_URL=https://test.pypi.org/legacy
     - TWINE_USERNAME=lelit
       # Note: TWINE_PASSWORD is set in Travis settings

From 7ab2ab7095aef93c58fd4fce2cc804b4f4c489ac Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 19:28:06 +0200
Subject: [PATCH 15/32] Use consistent style

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f909079..5083ba5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,6 @@ script:
   - cibuildwheel --output-dir wheelhouse
   - |
     if [[ $TRAVIS_TAG ]]; then
-      python -m pip install twine
-      python -m twine upload wheelhouse/*.whl
+      pip install twine
+      twine upload wheelhouse/*.whl
     fi

From 0219abfb766e3050b775ef9c9623ca473046e6d9 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 19:30:27 +0200
Subject: [PATCH 16/32] Try using Python 3.5 to execute the CI script, for
 MacOS...

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5083ba5..df2afc6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,7 @@ env:
       # Note: TWINE_PASSWORD is set in Travis settings
 
 language: python
-python:
-  - "3.6"
+python: "3.5"
 
 script:
   - pip install https://github.com/tgarc/cibuildwheel/archive/master.zip

From 8885b70daa6b3909ac2d00220f813ce5696bdb34 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 21:12:52 +0200
Subject: [PATCH 17/32] Add Win build recipe

---
 appveyor.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..f4a6c9b
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,21 @@
+environment:
+  global:
+    CIBW_TEST_REQUIRES: "pytest pytest-benchmark pytz"
+    CIBW_TEST_COMMAND: "py.test {project}/tests"
+    CIBW_SKIP: "cp2* cp33*"
+    TWINE_REPOSITORY_URL: https://test.pypi.org/legacy
+    TWINE_USERNAME: lelit
+    # Note: TWINE_PASSWORD is set in Travis settings
+
+build_script:
+  - pip install https://github.com/tgarc/cibuildwheel/archive/master.zip
+  - cibuildwheel --output-dir wheelhouse
+  - ps: >-
+      if ($env:APPVEYOR_REPO_TAG -eq "true") {
+        pip install twine
+        twine upload (resolve-path wheelhouse\*.whl)
+      }
+
+artifacts:
+  - path: "wheelhouse\\*.whl"
+    name: Wheels

From 89ef58eb4fc3b90b46956ccd4a5a747dcba8a0ce Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 21:18:24 +0200
Subject: [PATCH 18/32] Comment out MacOS, it definitely does not work

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index df2afc6..dd95fe4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ matrix:
     - sudo: required
       services:
         - docker
-    - os: osx
+#    - os: osx
 
 env:
   global:

From ef096326eb7352edbaf1218e9890588377ff0a42 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Mon, 3 Jul 2017 21:37:07 +0200
Subject: [PATCH 19/32] Use Python 3.5 for the CI build on Appveyor

---
 appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index f4a6c9b..a64db06 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,6 +6,8 @@ environment:
     TWINE_REPOSITORY_URL: https://test.pypi.org/legacy
     TWINE_USERNAME: lelit
     # Note: TWINE_PASSWORD is set in Travis settings
+  matrix:
+    - PYTHON: "C:\\Python35-x64"
 
 build_script:
   - pip install https://github.com/tgarc/cibuildwheel/archive/master.zip

From ac06884cd6c785d025e5e3131ebb565f7e037ff2 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Tue, 4 Jul 2017 10:52:40 +0200
Subject: [PATCH 20/32] Use the configured Python

---
 appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index a64db06..5c9cb21 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,12 +10,12 @@ environment:
     - PYTHON: "C:\\Python35-x64"
 
 build_script:
-  - pip install https://github.com/tgarc/cibuildwheel/archive/master.zip
+  - "%PYTHON% -m pip install https://github.com/tgarc/cibuildwheel/archive/master.zip"
   - cibuildwheel --output-dir wheelhouse
   - ps: >-
       if ($env:APPVEYOR_REPO_TAG -eq "true") {
-        pip install twine
-        twine upload (resolve-path wheelhouse\*.whl)
+        %PYTHON% -m pip install twine
+        %PYTHON% -m twine upload (resolve-path wheelhouse\*.whl)
       }
 
 artifacts:

From 8a276b554bb9b9446e108128c1f48f2d88311638 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Tue, 4 Jul 2017 10:56:06 +0200
Subject: [PATCH 21/32] Fix interpreter path

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 5c9cb21..c27543f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ environment:
     TWINE_USERNAME: lelit
     # Note: TWINE_PASSWORD is set in Travis settings
   matrix:
-    - PYTHON: "C:\\Python35-x64"
+    - PYTHON: "C:\\Python35-x64\\python.exe"
 
 build_script:
   - "%PYTHON% -m pip install https://github.com/tgarc/cibuildwheel/archive/master.zip"

From bf1eba59e18fc57c1c4aa8fbe82a0b7e371bc908 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Tue, 4 Jul 2017 11:56:35 +0200
Subject: [PATCH 22/32] Try using default Python

---
 .travis.yml  |  3 +--
 appveyor.yml | 10 ++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd95fe4..67547ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,10 +15,9 @@ env:
       # Note: TWINE_PASSWORD is set in Travis settings
 
 language: python
-python: "3.5"
 
 script:
-  - pip install https://github.com/tgarc/cibuildwheel/archive/master.zip
+  - pip install cibuildwheel==0.3.0
   - cibuildwheel --output-dir wheelhouse
   - |
     if [[ $TRAVIS_TAG ]]; then
diff --git a/appveyor.yml b/appveyor.yml
index c27543f..a683acd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,16 +6,14 @@ environment:
     TWINE_REPOSITORY_URL: https://test.pypi.org/legacy
     TWINE_USERNAME: lelit
     # Note: TWINE_PASSWORD is set in Travis settings
-  matrix:
-    - PYTHON: "C:\\Python35-x64\\python.exe"
 
 build_script:
-  - "%PYTHON% -m pip install https://github.com/tgarc/cibuildwheel/archive/master.zip"
-  - cibuildwheel --output-dir wheelhouse
+  - "python -m pip install cibuildwheel==0.3.0
+  - "python -m cibuildwheel --output-dir wheelhouse"
   - ps: >-
       if ($env:APPVEYOR_REPO_TAG -eq "true") {
-        %PYTHON% -m pip install twine
-        %PYTHON% -m twine upload (resolve-path wheelhouse\*.whl)
+        python -m pip install twine
+        python -m twine upload (resolve-path wheelhouse\*.whl)
       }
 
 artifacts:

From e7d1bd5cc878d4db70108a2e5db6c667601f7068 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Tue, 4 Jul 2017 12:01:03 +0200
Subject: [PATCH 23/32] Must use Python 3, due to an issue in cibuildwheel

It should use the right interpreter version to extract the package name...
---
 .travis.yml  |  3 ++-
 appveyor.yml | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 67547ad..dd95fe4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,10 @@ env:
       # Note: TWINE_PASSWORD is set in Travis settings
 
 language: python
+python: "3.5"
 
 script:
-  - pip install cibuildwheel==0.3.0
+  - pip install https://github.com/tgarc/cibuildwheel/archive/master.zip
   - cibuildwheel --output-dir wheelhouse
   - |
     if [[ $TRAVIS_TAG ]]; then
diff --git a/appveyor.yml b/appveyor.yml
index a683acd..0ea3a82 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,14 +6,16 @@ environment:
     TWINE_REPOSITORY_URL: https://test.pypi.org/legacy
     TWINE_USERNAME: lelit
     # Note: TWINE_PASSWORD is set in Travis settings
+  matrix:
+    - PYTHON: "C:\\Python35-x64\\python.exe"
 
 build_script:
-  - "python -m pip install cibuildwheel==0.3.0
-  - "python -m cibuildwheel --output-dir wheelhouse"
+  - "%PYTHON% -m pip install https://github.com/tgarc/cibuildwheel/archive/master.zip"
+  - "%PYTHON% -m cibuildwheel --output-dir wheelhouse"
   - ps: >-
       if ($env:APPVEYOR_REPO_TAG -eq "true") {
-        python -m pip install twine
-        python -m twine upload (resolve-path wheelhouse\*.whl)
+        %PYTHON% -m pip install twine
+        %PYTHON% -m twine upload (resolve-path wheelhouse\*.whl)
       }
 
 artifacts:

From cb4b923a559254be8e786583967e19b9b907d2ba Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Tue, 4 Jul 2017 12:08:56 +0200
Subject: [PATCH 24/32] Initialize rapidjson submodule

---
 appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 0ea3a82..614d107 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,6 +9,8 @@ environment:
   matrix:
     - PYTHON: "C:\\Python35-x64\\python.exe"
 
+install: "git submodule update --init --recursive"
+
 build_script:
   - "%PYTHON% -m pip install https://github.com/tgarc/cibuildwheel/archive/master.zip"
   - "%PYTHON% -m cibuildwheel --output-dir wheelhouse"

From 9a975f992693776e3a10a2bddc38462055ad2551 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Tue, 4 Jul 2017 12:37:50 +0200
Subject: [PATCH 25/32] Last try with MacOS

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index dd95fe4..a53ac1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,10 @@ matrix:
     - sudo: required
       services:
         - docker
-#    - os: osx
+    - os: osx
+      language: generic
+      env:
+        - PY_VERSION=3
 
 env:
   global:

From 7c90a2ec6b778d575167029ef9ad34105bbc6f2d Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Tue, 4 Jul 2017 12:42:31 +0200
Subject: [PATCH 26/32] Try with an explicit python3 interpreter

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a53ac1c..65cb31a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,10 +21,10 @@ language: python
 python: "3.5"
 
 script:
-  - pip install https://github.com/tgarc/cibuildwheel/archive/master.zip
-  - cibuildwheel --output-dir wheelhouse
+  - python3 -m pip install https://github.com/tgarc/cibuildwheel/archive/master.zip
+  - python3 -m cibuildwheel --output-dir wheelhouse
   - |
     if [[ $TRAVIS_TAG ]]; then
-      pip install twine
-      twine upload wheelhouse/*.whl
+      python3 -m pip install twine
+      python3 -m twine upload wheelhouse/*.whl
     fi

From 769cea4aef6286d124ca131faeabef66b76a1864 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Tue, 4 Jul 2017 13:52:20 +0200
Subject: [PATCH 27/32] Give up on MacOS

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 65cb31a..2dfd4d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,10 @@ matrix:
     - sudo: required
       services:
         - docker
-    - os: osx
-      language: generic
-      env:
-        - PY_VERSION=3
+#    - os: osx
+#      language: generic
+#      env:
+#        - PY_VERSION=3
 
 env:
   global:

From 95e1c9d188b6a2c6fae6298276f781b1d58609a3 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Sat, 12 Aug 2017 20:01:24 +0200
Subject: [PATCH 28/32] Use cibuildwheel 0.4.0, that appears to support Python
 3

Also, activate interim unconditional upload wheels to testpypi, to see how it goes.
---
 .travis.yml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2dfd4d3..3264d34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+language: python
+python: "3.6"
+
 matrix:
   include:
     - sudo: required
@@ -17,14 +20,13 @@ env:
     - TWINE_USERNAME=lelit
       # Note: TWINE_PASSWORD is set in Travis settings
 
-language: python
-python: "3.5"
-
 script:
-  - python3 -m pip install https://github.com/tgarc/cibuildwheel/archive/master.zip
-  - python3 -m cibuildwheel --output-dir wheelhouse
-  - |
-    if [[ $TRAVIS_TAG ]]; then
-      python3 -m pip install twine
-      python3 -m twine upload wheelhouse/*.whl
-    fi
+  - pip install cibuildwheel==0.4.0
+  - cibuildwheel --output-dir wheelhouse
+  # - |
+  #   if [[ $TRAVIS_TAG ]]; then
+  #     pip install twine
+  #     twine upload wheelhouse/*.whl
+  #   fi
+  - pip install twine
+  - twine upload wheelhouse/*.whl

From e102358760b7d98bf73339bd135009ab39dd5c81 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Sat, 12 Aug 2017 20:26:18 +0200
Subject: [PATCH 29/32] Use cibuildwheel 0.4.0 also on Appveyor

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 614d107..caf3413 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,7 @@ environment:
 install: "git submodule update --init --recursive"
 
 build_script:
-  - "%PYTHON% -m pip install https://github.com/tgarc/cibuildwheel/archive/master.zip"
+  - "%PYTHON% -m pip install cibuildwheel==0.4.0
   - "%PYTHON% -m cibuildwheel --output-dir wheelhouse"
   - ps: >-
       if ($env:APPVEYOR_REPO_TAG -eq "true") {

From 9fada457fec384754ab12e901a669e89fe18898b Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Sat, 12 Aug 2017 20:27:04 +0200
Subject: [PATCH 30/32] Revert unconditional wheels upload

---
 .travis.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3264d34..08403a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,10 +23,8 @@ env:
 script:
   - pip install cibuildwheel==0.4.0
   - cibuildwheel --output-dir wheelhouse
-  # - |
-  #   if [[ $TRAVIS_TAG ]]; then
-  #     pip install twine
-  #     twine upload wheelhouse/*.whl
-  #   fi
-  - pip install twine
-  - twine upload wheelhouse/*.whl
+  - |
+    if [[ $TRAVIS_TAG ]]; then
+      pip install twine
+      twine upload wheelhouse/*.whl
+    fi

From 2ac1f4546c5242d30ce0e69f6b4e3359bd29ebe5 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Sat, 12 Aug 2017 20:27:31 +0200
Subject: [PATCH 31/32] Upload to the official PyPI

---
 .travis.yml  | 1 -
 appveyor.yml | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 08403a8..51289de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,6 @@ env:
     - CIBW_TEST_REQUIRES="pytest pytest-benchmark pytz"
     - CIBW_TEST_COMMAND="py.test {project}/tests"
     - CIBW_SKIP="cp2* cp33*"
-    - TWINE_REPOSITORY_URL=https://test.pypi.org/legacy
     - TWINE_USERNAME=lelit
       # Note: TWINE_PASSWORD is set in Travis settings
 
diff --git a/appveyor.yml b/appveyor.yml
index caf3413..439f816 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,9 +3,8 @@ environment:
     CIBW_TEST_REQUIRES: "pytest pytest-benchmark pytz"
     CIBW_TEST_COMMAND: "py.test {project}/tests"
     CIBW_SKIP: "cp2* cp33*"
-    TWINE_REPOSITORY_URL: https://test.pypi.org/legacy
     TWINE_USERNAME: lelit
-    # Note: TWINE_PASSWORD is set in Travis settings
+    # Note: TWINE_PASSWORD is set in Appveyor settings
   matrix:
     - PYTHON: "C:\\Python35-x64\\python.exe"
 

From 0e4c63f5d78eb2d61936e8e2604a5dec89331379 Mon Sep 17 00:00:00 2001
From: Lele Gaifax <lele@metapensiero.it>
Date: Sat, 12 Aug 2017 21:20:31 +0200
Subject: [PATCH 32/32] Fix YAML syntax

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 439f816..0207ef1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,7 +11,7 @@ environment:
 install: "git submodule update --init --recursive"
 
 build_script:
-  - "%PYTHON% -m pip install cibuildwheel==0.4.0
+  - "%PYTHON% -m pip install cibuildwheel==0.4.0"
   - "%PYTHON% -m cibuildwheel --output-dir wheelhouse"
   - ps: >-
       if ($env:APPVEYOR_REPO_TAG -eq "true") {