Fix/py36 (#20)

* fix: add py36 to build plans

* fix: adjust to changes in setuptools

* fix: try again

* fix: stubborn setuptools..

* fix: different way to get versions

* try again

* ..and again

.travis.yml

@@ -46,6 +46,14 @@ matrix:
     env:
     - MB_PYTHON_VERSION=3.5
     - PLAT=i686
+  - os: linux
+    env:
+    - MB_PYTHON_VERSION=3.6
+    - TOXENV=py36
+  - os: linux
+    env:
+    - MB_PYTHON_VERSION=3.6
+    - PLAT=i686
   - os: osx
     language: objective-c
     env:
@@ -58,9 +66,13 @@ matrix:
     language: objective-c
     env:
     - MB_PYTHON_VERSION=3.5
+  - os: osx
+    language: objective-c
+    env:
+    - MB_PYTHON_VERSION=3.6
 before_install:
 - "(git clone https://github.com/matthew-brett/multibuild.git && cd multibuild &&
-  git checkout 06036d5349a)"
+  git checkout e6ebbfa)"
 - TEST_DEPENDS="nose"
 - source multibuild/common_utils.sh
 - source multibuild/travis_steps.sh

appveyor.yml

@@ -56,6 +56,14 @@ environment:
       PYTHON_VERSION: "3.5.0"
       PYTHON_ARCH: "64"
 
+    - PYTHON: "C:\\Python36"
+      PYTHON_VERSION: "3.6.0"
+      PYTHON_ARCH: "32"
+
+    - PYTHON: "C:\\Python36-x64"
+      PYTHON_VERSION: "3.6.0"
+      PYTHON_ARCH: "64"
+
   password:
     secure: fAEJDjlDCADoXUIYv64Ufdvta6dvRrj2c6NIgObi3No=
 
@@ -98,10 +106,8 @@ install:
   - "powershell appveyor\\install.ps1"
   - choco install -y swig
 
-  - "%CMD_IN_ENV% python appveyor/build_glpk.py"
-
-  - "%CMD_IN_ENV% pip install nose twine wheel"
-
+  - "%PYTHON%/python -m pip install pip setuptools>=34.0 nose twine wheel --upgrade"
+  - "%CMD_IN_ENV% %PYTHON%/python appveyor/build_glpk.py"
   - "%CMD_IN_ENV% python setup.py install"
 
 build: off
@@ -128,4 +134,4 @@ deploy_script:
   - ps: >-
       if($env:appveyor_repo_tag -eq 'True') {
           Invoke-Expression "$env:PYTHON/Scripts/twine upload dist/* --username Nikolaus.Sonnenschein --password $env:password"
-      }
+      }

appveyor/build_glpk.py

@@ -6,7 +6,7 @@
 import tarfile
 import struct
 import shutil
-import setuptools.msvc9_support
+import setuptools.msvc
 try:
     import urllib2
 except ImportError:  # python 3
@@ -37,7 +37,7 @@ def get_vcvarsall_cmd():
         vc_ver = 10
     else:
         vc_ver = 9
-    vc_path = setuptools.msvc9_support.find_vcvarsall(vc_ver)
+    vc_path = setuptools.msvc.msvc9_find_vcvarsall(vc_ver)
     assert vc_path is not None
     return '"%s" %s' % (vc_path, " amd64" if bitness == 64 else "")
 
@@ -58,4 +58,4 @@ def get_vcvarsall_cmd():
     os.system(get_vcvarsall_cmd() + "& nmake /f Makefile_VC")
 shutil.copy2("glpk.lib", "../../..")
 os.chdir("../../..")
-shutil.copy2(glpk_build_dir + "/src/glpk.h", ".")
+shutil.copy2(glpk_build_dir + "/src/glpk.h", ".")

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = flake8, py27, py34, py35
+envlist = flake8, py27, py34, py35, py36
 
 [testenv:flake8]
 basepython=python