Merge pull request #126 from arcondello/py37

Add python3.7 support

Author: arcondello

.appveyor.yml

@@ -23,6 +23,14 @@ environment:
       PYTHON_VERSION: "2.7.x"
       PYTHON_ARCH: "64"
 
+    - PYTHON: "C:\\Python34"
+      PYTHON_VERSION: "3.4.x"
+      PYTHON_ARCH: "32"
+
+    - PYTHON: "C:\\Python34-x64"
+      PYTHON_VERSION: "3.4.x"
+      PYTHON_ARCH: "64"
+
     - PYTHON: "C:\\Python35"
       PYTHON_VERSION: "3.5.x"
       PYTHON_ARCH: "32"
@@ -39,6 +47,14 @@ environment:
       PYTHON_VERSION: "3.6.x"
       PYTHON_ARCH: "64"
 
+    - PYTHON: "C:\\Python37"
+      PYTHON_VERSION: "3.7.x"
+      PYTHON_ARCH: "32"
+
+    - PYTHON: "C:\\Python37-x64"
+      PYTHON_VERSION: "3.7.x"
+      PYTHON_ARCH: "64"
+
 install:
   # If there is a newer build queued for the same PR, cancel this one.
   # The AppVeyor 'rollout builds' option is supposed to serve the same
@@ -77,7 +93,6 @@ install:
   # pip will build them from source using the MSVC compiler matching the
   # target Python version and architecture
   - "%CMD_IN_ENV% pip install -r python/requirements.txt"
-  - "%CMD_IN_ENV% pip install cython==0.27"
   - "%CMD_IN_ENV% pip install wheel setuptools --upgrade --force"
 
 build_script:

.travis.yml

@@ -49,19 +49,43 @@ matrix:
       language: generic
       before_install:
         - brew update
-        - brew upgrade python
-        - pip3 install virtualenv
-        - virtualenv env -p python3
-        - source env/bin/activate
+        - brew upgrade pyenv
+        - pyenv install 2.7.15 -s
+        - pyenv install 3.4.8 -s
+        - pyenv install 3.5.5 -s
+        - pyenv install 3.6.6 -s
+        - pyenv install 3.7.0 -s
       script:
-        - ./ci/travis/osx-build-wheel.sh
-        - python setup.py sdist
+        - eval "$(pyenv init -)"
+        - pyenv local 2.7.15 3.4.8 3.5.5 3.6.6 3.7.0
+        - python2.7 -m pip install -r ./python/requirements.txt
+        - python2.7 -m pip install .
+        - python2.7 -m unittest tests
+        - python3.4 -m pip install -r ./python/requirements.txt
+        - python3.4 -m pip install .
+        - python3.4 -m unittest tests
+        - python3.5 -m pip install -r ./python/requirements.txt
+        - python3.5 -m pip install .
+        - python3.5 -m unittest tests
+        - python3.6 -m pip install -r ./python/requirements.txt
+        - python3.6 -m pip install .
+        - python3.6 -m unittest tests
+        - python3.7 -m pip install -r ./python/requirements.txt
+        - python3.7 -m pip install .
+        - python3.7 -m unittest tests
       after_success:
-        - pip install twine
+        - pyenv local 2.7.15 3.4.8 3.5.5 3.6.6 3.7.0
+        - python2.7 setup.py bdist_wheel
+        - python3.4 setup.py bdist_wheel
+        - python3.5 setup.py bdist_wheel
+        - python3.6 setup.py bdist_wheel
+        - python3.7 setup.py bdist_wheel
+        - python3.7 setup.py sdist
       deploy:
         provider: script
         script:
-          - twine upload --username $TWINE_USERNAME --password $TWINE_PASSWORD --skip-existing wheelhouse/* dist/*
+          - pip install twine
+          - twine upload --username $TWINE_USERNAME --password $TWINE_PASSWORD --skip-existing
         skip_cleanup: true
         on:
           tags: true

ci/travis/build-wheels.sh

@@ -11,7 +11,6 @@ for PYBIN in /opt/python/*/bin; do
         continue
     fi
     "${PYBIN}/pip" install -r /io/python/requirements.txt
-    "${PYBIN}/pip" install cython==0.27
     "${PYBIN}/pip" wheel -e /io/ -w wheelhouse/
 done
 

python/requirements.txt

@@ -1 +1,3 @@
-dimod==0.6.10
+dimod==0.6.13; python_version>="3.5"
+dimod==0.6.10; python_version<="3.4"
+cython==0.28.4

setup.py

@@ -59,12 +59,29 @@ def build_extensions(self):
 
 packages = ['dwave_qbsolv']
 
+classifiers = [
+    'License :: OSI Approved :: Apache Software License',
+    'Operating System :: OS Independent',
+    'Programming Language :: Python :: 2',
+    'Programming Language :: Python :: 2.7',
+    'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.4',
+    'Programming Language :: Python :: 3.5',
+    'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
+    ]
+
+python_requires = '>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*'
+
 setup(
     name='dwave_qbsolv',
     version='0.2.7',
     packages=packages,
     package_dir={'dwave_qbsolv': 'python/dwave_qbsolv'},
     install_requires=['dimod>=0.6.10,<0.7.0'],
     ext_modules=extensions,
-    cmdclass={'build_ext': build_ext_compiler_check}
+    cmdclass={'build_ext': build_ext_compiler_check},
+    long_description=open('readme.md').read(),
+    classifiers=classifiers,
+    python_requires=python_requires
 )