Merge pull request #153 from randomir/support-py39

Support py39

Author: randomir

.appveyor.yml

@@ -14,6 +14,8 @@ environment:
     - PYTHON: "C:\\Python37-x64"
     - PYTHON: "C:\\Python38"
     - PYTHON: "C:\\Python38-x64"
+    - PYTHON: "C:\\Python39"
+    - PYTHON: "C:\\Python39-x64"
 
 install:
   # required to link py35 (x86 and x64)

.circleci/config.yml

@@ -1,44 +1,44 @@
 version: 2
 jobs:
-  test-3.6: &full-test-template
+  test-3.9: &full-test-template
     docker:
-      - image: circleci/python:3.6-jessie
+      - image: circleci/python:3.9
 
     working_directory: ~/repo
 
     steps:
 
       - checkout
 
-      - restore_cache:
+      - restore_cache: &restore-cache-env
           keys:
-          - v1-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "tests/requirements.txt" }}-{{ .Environment.CIRCLE_JOB }}
+          - v2-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "tests/requirements.txt" }}-{{ .Environment.CIRCLE_JOB }}
 
       - run:
           name: create virtualenv
           command: |
             python -m virtualenv env
 
-      - run: &install-dependencies-template
+      - run: &install-dependencies
           name: install dependencies
           command: |
             . env/bin/activate
             python --version
             pip install -r requirements.txt -r tests/requirements.txt
 
-      - save_cache:
+      - save_cache: &save-cache-env
           paths:
             - ./env
-          key: v1-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "tests/requirements.txt" }}-{{ .Environment.CIRCLE_JOB }}
+          key: v2-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "tests/requirements.txt" }}-{{ .Environment.CIRCLE_JOB }}
 
-      - run: &install-package-template
+      - run: &install-package
           name: install package
           command: |
             . env/bin/activate
             python setup.py build_ext --inplace
             pip install .
         
-      - run: &run-tests-template
+      - run: &run-tests
           name: run unittests
           command: |
             . env/bin/activate
@@ -57,23 +57,28 @@ jobs:
   test-3.8:
     <<: *full-test-template
     docker:
-      - image: circleci/python:3.8-buster
+      - image: circleci/python:3.8
 
   test-3.7:
     <<: *full-test-template
     docker:
-      - image: circleci/python:3.7-stretch
+      - image: circleci/python:3.7
+
+  test-3.6:
+    <<: *full-test-template
+    docker:
+      - image: circleci/python:3.6
 
   test-3.5:
     <<: *full-test-template
     docker:
-      - image: circleci/python:3.5-jessie
+      - image: circleci/python:3.5
 
-  test-osx-3.8: &osx-tests-template
+  test-osx-3.9: &osx-tests-template
     macos:
-      xcode: "11.2.1"
+      xcode: "12.2.0"
     environment:
-      PYTHON: 3.8.0
+      PYTHON: 3.9.0
       HOMEBREW_NO_AUTO_UPDATE: 1
 
       # Force (lie about) macOS 10.9 binary compatibility.
@@ -91,66 +96,63 @@ jobs:
           command: |
             brew install pyenv
 
-      - restore_cache:
+      - restore_cache: &restore-cache-pyenv
           keys:
-            - pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1
+            - v2-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode-12.2.0
 
       - run:
           name: install python
           command: |
             pyenv install $PYTHON -s
 
-      - save_cache:
+      - save_cache: &save-cache-pyenv
           paths:
             - ~/.pyenv
-          key: pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1
+          key: v2-pyenv-{{ .Environment.CIRCLE_JOB }}-xcode-12.2.0
 
-      - run:
+      - run: &create-virtualenv-pyenv
           name: create virtualenv
           command: |
             eval "$(pyenv init -)"
             pyenv local $PYTHON
             python -m pip install virtualenv
             python -m virtualenv env
 
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "tests/requirements.txt" }}-{{ .Environment.CIRCLE_JOB }}
+      - restore_cache: *restore-cache-env
 
-      - run: &install-dependencies-template
-          name: install dependencies
-          command: |
-            . env/bin/activate
-            python --version
-            pip install -r requirements.txt -r tests/requirements.txt
+      - run: *install-dependencies
 
-      - save_cache:
-          paths:
-            - ./env
-          key: v1-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "tests/requirements.txt" }}-{{ .Environment.CIRCLE_JOB }}
+      - save_cache: *save-cache-env
 
-      - run: *install-package-template
+      - run: *install-package
 
-      - run: *run-tests-template
+      - run: *run-tests
+
+  test-osx-3.8:
+    <<: *osx-tests-template
+    environment:
+      PYTHON: 3.8.6
+      HOMEBREW_NO_AUTO_UPDATE: 1
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
   test-osx-3.7:
     <<: *osx-tests-template
     environment:
-      PYTHON: 3.7.4
+      PYTHON: 3.7.9
       HOMEBREW_NO_AUTO_UPDATE: 1
       MACOSX_DEPLOYMENT_TARGET: 10.9
 
   test-osx-3.6:
     <<: *osx-tests-template
     environment:
-      PYTHON: 3.6.5
+      PYTHON: 3.6.12
       HOMEBREW_NO_AUTO_UPDATE: 1
       MACOSX_DEPLOYMENT_TARGET: 10.9
 
   test-osx-3.5:
     <<: *osx-tests-template
     environment:
-      PYTHON: 3.5.5
+      PYTHON: 3.5.10
       HOMEBREW_NO_AUTO_UPDATE: 1
       MACOSX_DEPLOYMENT_TARGET: 10.9
 
@@ -171,7 +173,7 @@ jobs:
           name: build wheels
           command: |
             for PYBIN in /opt/python/*/bin; do
-              "${PYBIN}/python" -c "import sys; sys.exit((3,5)<=sys.version_info<(3,9))" && continue
+              "${PYBIN}/python" -c "import sys; sys.exit((3,5)<=sys.version_info<(3,10))" && continue
               "${PYBIN}/pip" install -r requirements.txt -r tests/requirements.txt
               "${PYBIN}/pip" wheel . -w ./wheelhouse
               "${PYBIN}/python" setup.py sdist -d ./dist
@@ -187,13 +189,6 @@ jobs:
       - store_artifacts:
           path: ./dist
 
-      - run: &init-pypirc-template
-          name: init .pypirc
-          command: |
-            echo -e "[pypi]" >> ~/.pypirc
-            echo -e "username = $PYPI_USERNAME" >> ~/.pypirc
-            echo -e "password = $PYPI_PASSWORD" >> ~/.pypirc
-
       - run:
           name: create a virtualenv
           command: |
@@ -202,23 +197,23 @@ jobs:
             "$python/pip" install virtualenv
             "$python/python" -m virtualenv env
 
-      - run: &upload-template
+      - run: &upload-pypi
           name: install twine and deploy
           command: |
             . env/bin/activate
-            python -m pip install twine
-            twine upload --skip-existing ./dist/*
+            pip install twine
+            twine upload -u "$PYPI_USERNAME" -p "$PYPI_PASSWORD" --skip-existing ./dist/*
 
   build-manylinux-32:
     <<: *manylinux-template
     docker:
       - image: quay.io/pypa/manylinux1_i686
 
-  build-osx-3.8: &osx-build-template
+  build-osx-3.9: &osx-build-template
     macos:
-      xcode: "11.2.0"
+      xcode: "12.2.0"
     environment:
-      PYTHON: 3.8.0
+      PYTHON: 3.9.0
       HOMEBREW_NO_AUTO_UPDATE: 1
       MACOSX_DEPLOYMENT_TARGET: 10.9
 
@@ -232,22 +227,20 @@ jobs:
           command: |
             brew install pyenv
 
+      - restore_cache: *restore-cache-pyenv
+
       - run:
           name: install python
           command: |
             pyenv install $PYTHON -s
 
-      - run:
-          name: create virtualenv
-          command: |
-            eval "$(pyenv init -)"
-            pyenv local $PYTHON
-            python -m pip install virtualenv
-            python -m virtualenv env
+      - save_cache: *save-cache-pyenv
+
+      - run: *create-virtualenv-pyenv
 
-      - run: *install-dependencies-template
+      - run: *install-dependencies
 
-      - run: *install-package-template
+      - run: *install-package
 
       - run:
           name: create bdist_wheel
@@ -258,28 +251,33 @@ jobs:
       - store_artifacts:
           path: ./dist
 
-      - run: *init-pypirc-template
+      - run: *upload-pypi
 
-      - run: *upload-template
+  build-osx-3.8:
+    <<: *osx-build-template
+    environment:
+      PYTHON: 3.8.6
+      HOMEBREW_NO_AUTO_UPDATE: 1
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
   build-osx-3.7:
     <<: *osx-build-template
     environment:
-      PYTHON: 3.7.4
+      PYTHON: 3.7.9
       HOMEBREW_NO_AUTO_UPDATE: 1
       MACOSX_DEPLOYMENT_TARGET: 10.9
 
   build-osx-3.6:
     <<: *osx-build-template
     environment:
-      PYTHON: 3.6.5
+      PYTHON: 3.6.12
       HOMEBREW_NO_AUTO_UPDATE: 1
       MACOSX_DEPLOYMENT_TARGET: 10.9
 
   build-osx-3.5:
     <<: *osx-build-template
     environment:
-      PYTHON: 3.5.5
+      PYTHON: 3.5.10
       HOMEBREW_NO_AUTO_UPDATE: 1
       MACOSX_DEPLOYMENT_TARGET: 10.9
 
@@ -288,10 +286,12 @@ workflows:
   version: 2
   test:
     jobs:
+      - test-3.9
       - test-3.8
       - test-3.7
       - test-3.6
       - test-3.5
+      - test-osx-3.9
       - test-osx-3.8
       - test-osx-3.7
       - test-osx-3.6
@@ -311,6 +311,12 @@ workflows:
               only: /^[0-9]+(\.[0-9]+)*(\.dev([0-9]+)?)?$/
             branches:
               ignore: /.*/
+      - build-osx-3.9:
+          filters:
+            tags:
+              only: /^[0-9]+(\.[0-9]+)*(\.dev([0-9]+)?)?$/
+            branches:
+              ignore: /.*/
       - build-osx-3.8:
           filters:
             tags:

requirements.txt

@@ -1,2 +1,2 @@
-dimod==0.9.5
+dimod==0.9.12
 cython==0.29.21

setup.py

@@ -67,6 +67,7 @@ def build_extensions(self):
     'Programming Language :: Python :: 3.6',
     'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
     ]
 
 python_requires = '>=3.5'