From 7cc5e4fd14f2a3613874362fca66f833f6693b51 Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Fri, 13 Jan 2017 20:56:39 +0900
Subject: [PATCH 1/8] travis update

* stop using tox
* use trusty dist
* Add Python 3.6 and 3.7-dev
* Stop pypy3 (until PyPy3.5 is released)
---
 .travis.yml        | 26 ++++++++++++++++----------
 docker/runtests.sh |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b4396cb7..8c65701d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,21 @@
 sudo: false
+dist: trusty
 language: python
-python: 3.5
-cache:
-  directories:
-    - $HOME/.cache/pip
+cache: pip
+
+python:
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7-dev"
+  - "pypy"
 
 branches:
   only:
     - master
 
-env:
-  - TOXENV=py27-c,py33-c,py34-c,py35-c
-  - TOXENV=py27-pure,py33-pure,py34-pure,py35-pure
-  - TOXENV=pypy-pure,pypy3-pure
-
 matrix:
   include:
     - sudo: required
@@ -34,6 +36,10 @@ install:
   - pip install tox cython
   - cython --cplus msgpack/_packer.pyx msgpack/_unpacker.pyx
 
-script: tox
+script:
+  - python -c 'import sys; print(hex(sys.maxsize))'
+  - python -c 'from msgpack import _packer, _unpacker'
+  - py.test
+  - MSGPACK_PUREPYTHON=x py.test
 
 # vim: sw=2 ts=2
diff --git a/docker/runtests.sh b/docker/runtests.sh
index 0d748023..0eea715a 100755
--- a/docker/runtests.sh
+++ b/docker/runtests.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e -x
 
-for V in cp35-cp35m cp34-cp34m cp27-cp27m cp27-cp27mu; do
+for V in cp36-cp36m cp35-cp35m cp34-cp34m cp27-cp27m cp27-cp27mu; do
     PYBIN=/opt/python/$V/bin
     $PYBIN/python setup.py install
     rm -rf build/       # Avoid lib build by narrow Python is used by wide python

From e8639ba6d64a29e387a60e32f507a029346495f8 Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Fri, 13 Jan 2017 21:03:05 +0900
Subject: [PATCH 2/8] Update appveyor too

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

diff --git a/appveyor.yml b/appveyor.yml
index a8a23528..92eefb29 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,12 +8,14 @@ environment:
     # isn't covered by this document) at the time of writing.
 
     - PYTHON: "C:\\Python27"
-    - PYTHON: "C:\\Python34"
-    - PYTHON: "C:\\Python35"
     - PYTHON: "C:\\Python27-x64"
+    - PYTHON: "C:\\Python34"
     - PYTHON: "C:\\Python34-x64"
-      DISTUTILS_USE_SDK: "1"
+    - PYTHON: "C:\\Python35"
+      #DISTUTILS_USE_SDK: "1"
     - PYTHON: "C:\\Python35-x64"
+    - PYTHON: "C:\\Python36"
+    - PYTHON: "C:\\Python36-x64"
 
 install:
   # We need wheel installed to build wheels

From 73c74609c7286211455e972663618490794511b1 Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Fri, 13 Jan 2017 21:04:39 +0900
Subject: [PATCH 3/8] travis fix

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

diff --git a/.travis.yml b/.travis.yml
index 8c65701d..761885fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,13 +33,14 @@ matrix:
 
 install:
   - pip install -U pip
-  - pip install tox cython
+  - pip install cython
   - cython --cplus msgpack/_packer.pyx msgpack/_unpacker.pyx
+  - pip install -e .
 
 script:
   - python -c 'import sys; print(hex(sys.maxsize))'
   - python -c 'from msgpack import _packer, _unpacker'
-  - py.test
-  - MSGPACK_PUREPYTHON=x py.test
+  - py.test -v test
+  - MSGPACK_PUREPYTHON=x py.test -v test
 
 # vim: sw=2 ts=2

From 1fd7d785bd971534efc22e3923abf925039e0b6e Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Fri, 13 Jan 2017 21:15:26 +0900
Subject: [PATCH 4/8] fix

---
 .travis.yml  | 7 ++++++-
 appveyor.yml | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 761885fb..0879f281 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,6 @@ python:
   - "3.5"
   - "3.6"
   - "3.7-dev"
-  - "pypy"
 
 branches:
   only:
@@ -30,6 +29,12 @@ matrix:
         - docker pull $DOCKER_IMAGE
       script:
         - docker run --rm -v `pwd`:/io -w /io $DOCKER_IMAGE /io/docker/runtests.sh
+    - python: "pypy"
+      install:
+        - python -c 'import sys; print(hex(sys.maxsize))'
+      script:
+        - py.test -v test
+
 
 install:
   - pip install -U pip
diff --git a/appveyor.yml b/appveyor.yml
index 92eefb29..a42d1d58 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,7 +12,7 @@ environment:
     - PYTHON: "C:\\Python34"
     - PYTHON: "C:\\Python34-x64"
     - PYTHON: "C:\\Python35"
-      #DISTUTILS_USE_SDK: "1"
+      DISTUTILS_USE_SDK: "1"
     - PYTHON: "C:\\Python35-x64"
     - PYTHON: "C:\\Python36"
     - PYTHON: "C:\\Python36-x64"

From 1ef2fe3bbb8ba864346cde048097f2f3516a593a Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Fri, 13 Jan 2017 21:18:09 +0900
Subject: [PATCH 5/8] stop using trusty.

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

diff --git a/.travis.yml b/.travis.yml
index 0879f281..a8c0d0a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 sudo: false
-dist: trusty
 language: python
 cache: pip
 

From 17f6123b92d43a93c3ed654ab5ec7cffd77bbdbb Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Fri, 13 Jan 2017 21:26:53 +0900
Subject: [PATCH 6/8] fix travis

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

diff --git a/.travis.yml b/.travis.yml
index a8c0d0a7..0170360e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ branches:
 matrix:
   include:
     - sudo: required
+      language: c
       services:
         - docker
       env:
@@ -30,7 +31,7 @@ matrix:
         - docker run --rm -v `pwd`:/io -w /io $DOCKER_IMAGE /io/docker/runtests.sh
     - python: "pypy"
       install:
-        - python -c 'import sys; print(hex(sys.maxsize))'
+        - pip install -e .
       script:
         - py.test -v test
 
diff --git a/appveyor.yml b/appveyor.yml
index a42d1d58..75072fb0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,8 +9,6 @@ environment:
 
     - PYTHON: "C:\\Python27"
     - PYTHON: "C:\\Python27-x64"
-    - PYTHON: "C:\\Python34"
-    - PYTHON: "C:\\Python34-x64"
     - PYTHON: "C:\\Python35"
       DISTUTILS_USE_SDK: "1"
     - PYTHON: "C:\\Python35-x64"

From 93694894f011a1fad47835ef7d9b34fc1d6f3d7a Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Fri, 13 Jan 2017 21:31:20 +0900
Subject: [PATCH 7/8] appveyor: run cython explicitly

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

diff --git a/appveyor.yml b/appveyor.yml
index 75072fb0..f4023fcb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,6 +18,7 @@ environment:
 install:
   # We need wheel installed to build wheels
   - "%PYTHON%\\python.exe -m pip install -U pip wheel pytest cython"
+  - "%PYTHON%\\Scripts\\cython --cplus msgpack/_packer.pyx msgpack/_unpacker.pyx"
 
 build: off
 

From 3eaf07180d3a84de00785344351c33e50a66b0fc Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Fri, 13 Jan 2017 21:36:59 +0900
Subject: [PATCH 8/8] appveyor: stop DISTUTILS_USE_SDK

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

diff --git a/appveyor.yml b/appveyor.yml
index f4023fcb..e63423da 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,7 +10,6 @@ environment:
     - PYTHON: "C:\\Python27"
     - PYTHON: "C:\\Python27-x64"
     - PYTHON: "C:\\Python35"
-      DISTUTILS_USE_SDK: "1"
     - PYTHON: "C:\\Python35-x64"
     - PYTHON: "C:\\Python36"
     - PYTHON: "C:\\Python36-x64"