Merge pull request #148 from arcondello/fix/versions

Remove python 2.7 and 3.4 support and support latest dimod

Author: arcondello

.appveyor.yml

@@ -14,23 +14,6 @@ environment:
     secure: 9/YAQhmz9Kb1ZeXzhBYeQA==
 
   matrix:
-    # Python < 2.7 is not supported by dimod
-    - PYTHON: "C:\\Python27"
-      PYTHON_VERSION: "2.7.x"
-      PYTHON_ARCH: "32"
-
-    - PYTHON: "C:\\Python27-x64"
-      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"
@@ -55,6 +38,14 @@ environment:
       PYTHON_VERSION: "3.7.x"
       PYTHON_ARCH: "64"
 
+    - PYTHON: "C:\\Python38"
+      PYTHON_VERSION: "3.8.x"
+      PYTHON_ARCH: "32"
+
+    - PYTHON: "C:\\Python38-x64"
+      PYTHON_VERSION: "3.8.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

.circleci/config.yml

@@ -54,29 +54,10 @@ jobs:
             . env/bin/activate
             codecov
 
-      - run: &sdist-build-template
-          name: build sdist
-          command: |
-            . env/bin/activate
-            python setup.py sdist
-
-      - store_artifacts:
-          path: ./dist
-
-      - run: &sdist-install-template
-          name: test installing from sdist without cython
-          command: |
-            python -m virtualenv env_sdist
-            . env_sdist/bin/activate
-            pip install dist/dwave-qbsolv-*.tar.gz
-
-      - run: &sdist-cython-install-template
-          name: install sdist with cython
-          command: |
-            python -m virtualenv env_cython_sdist
-            . env_cython_sdist/bin/activate
-            pip install cython
-            pip install dist/dwave-qbsolv-*.tar.gz
+  test-3.8:
+    <<: *full-test-template
+    docker:
+      - image: circleci/python:3.8-buster
 
   test-3.7:
     <<: *full-test-template
@@ -88,22 +69,17 @@ jobs:
     docker:
       - image: circleci/python:3.5-jessie
 
-  test-3.4:
-    <<: *full-test-template
-    docker:
-      - image: circleci/python:3.4-jessie
-
-  test-2.7:
-    <<: *full-test-template
-    docker:
-      - image: circleci/python:2.7-jessie
-
-  test-osx-3.7: &osx-tests-template
+  test-osx-3.8: &osx-tests-template
     macos:
-      xcode: "9.4.1"
+      xcode: "11.2.1"
     environment:
-      PYTHON: 3.7.0
-      # HOMEBREW_NO_AUTO_UPDATE: 1  # for 3.7 we need to update homebrew
+      PYTHON: 3.8.0
+      HOMEBREW_NO_AUTO_UPDATE: 1
+
+      # Force (lie about) macOS 10.9 binary compatibility.
+      # Needed for properly versioned wheels.
+      # See: https://github.com/MacPython/wiki/wiki/Spinning-wheels
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
     working_directory: ~/repo
 
@@ -117,7 +93,7 @@ jobs:
 
       - restore_cache:
           keys:
-            - pyenv-{{ .Environment.CIRCLE_JOB }}
+            - pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1
 
       - run:
           name: install python
@@ -127,7 +103,7 @@ jobs:
       - save_cache:
           paths:
             - ~/.pyenv
-          key: pyenv-{{ .Environment.CIRCLE_JOB }}
+          key: pyenv-{{ .Environment.CIRCLE_JOB }}-xcode11.2.1
 
       - run:
           name: create virtualenv
@@ -157,38 +133,26 @@ jobs:
 
       - run: *run-tests-template
 
-      - run: *sdist-build-template
-
-      - store_artifacts:
-          path: ./dist
-
-      - run: *sdist-install-template
-
-      - run: *sdist-cython-install-template
+  test-osx-3.7:
+    <<: *osx-tests-template
+    environment:
+      PYTHON: 3.7.4
+      HOMEBREW_NO_AUTO_UPDATE: 1
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
   test-osx-3.6:
     <<: *osx-tests-template
     environment:
       PYTHON: 3.6.5
       HOMEBREW_NO_AUTO_UPDATE: 1
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
   test-osx-3.5:
     <<: *osx-tests-template
     environment:
       PYTHON: 3.5.5
       HOMEBREW_NO_AUTO_UPDATE: 1
-
-  test-osx-3.4:
-    <<: *osx-tests-template
-    environment:
-      PYTHON: 3.4.8
-      HOMEBREW_NO_AUTO_UPDATE: 1
-
-  test-osx-2.7:
-    <<: *osx-tests-template
-    environment:
-      PYTHON: 2.7.15
-      HOMEBREW_NO_AUTO_UPDATE: 1
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
 ##################################################################################################
 # Deploy
@@ -207,7 +171,8 @@ jobs:
           name: build wheels
           command: |
             for PYBIN in /opt/python/*/bin; do
-              "${PYBIN}/pip" install -r python/requirements.txt
+              if "${PYBIN}/python" -c "import sys; sys.exit(sys.version_info>=(3, 5))"; then continue; fi;
+              "${PYBIN}/pip" install -r requirements.txt
               "${PYBIN}/pip" wheel . -w ./wheelhouse
               "${PYBIN}/python" setup.py sdist -d ./dist
             done
@@ -249,12 +214,13 @@ jobs:
     docker:
       - image: quay.io/pypa/manylinux1_i686
 
-  build-osx-3.7: &osx-build-template
+  build-osx-3.8: &osx-build-template
     macos:
-      xcode: "9.4.1"
+      xcode: "11.2.0"
     environment:
-      PYTHON: 3.7.0
-      # HOMEBREW_NO_AUTO_UPDATE: 1  # for 3.7 we need to update homebrew
+      PYTHON: 3.8.0
+      HOMEBREW_NO_AUTO_UPDATE: 1
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
     working_directory: ~/repo
 
@@ -266,20 +232,11 @@ jobs:
           command: |
             brew install pyenv
 
-      - restore_cache:
-          keys:
-            - pyenv-{{ .Environment.CIRCLE_JOB }}
-
       - run:
           name: install python
           command: |
             pyenv install $PYTHON -s
 
-      - save_cache:
-          paths:
-            - ~/.pyenv
-          key: pyenv-{{ .Environment.CIRCLE_JOB }}
-
       - run:
           name: create virtualenv
           command: |
@@ -305,44 +262,40 @@ jobs:
 
       - run: *upload-template
 
-  build-osx-3.6:
+  build-osx-3.7:
     <<: *osx-build-template
     environment:
-      PYTHON: 3.6.5
+      PYTHON: 3.7.4
       HOMEBREW_NO_AUTO_UPDATE: 1
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
-  build-osx-3.5:
+  build-osx-3.6:
     <<: *osx-build-template
     environment:
-      PYTHON: 3.5.5
+      PYTHON: 3.6.5
       HOMEBREW_NO_AUTO_UPDATE: 1
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
-  build-osx-3.4:
+  build-osx-3.5:
     <<: *osx-build-template
     environment:
-      PYTHON: 3.4.8
+      PYTHON: 3.5.5
       HOMEBREW_NO_AUTO_UPDATE: 1
+      MACOSX_DEPLOYMENT_TARGET: 10.9
 
-  build-osx-2.7:
-    <<: *osx-build-template
-    environment:
-      PYTHON: 2.7.15
-      HOMEBREW_NO_AUTO_UPDATE: 1
 
 workflows:
   version: 2
   test:
     jobs:
+      - test-3.8
       - test-3.7
       - test-3.6
       - test-3.5
-      - test-3.4
-      - test-2.7
+      - test-osx-3.8
       - test-osx-3.7
       - test-osx-3.6
       - test-osx-3.5
-      - test-osx-3.4
-      - test-osx-2.7
 
   deploy:
     jobs:
@@ -358,31 +311,25 @@ workflows:
               only: /^[0-9]+(\.[0-9]+)*(\.dev([0-9]+)?)?$/
             branches:
               ignore: /.*/
-      - build-osx-3.7:
-          filters:
-            tags:
-              only: /^[0-9]+(\.[0-9]+)*(\.dev([0-9]+)?)?$/
-            branches:
-              ignore: /.*/
-      - build-osx-3.6:
+      - build-osx-3.8:
           filters:
             tags:
               only: /^[0-9]+(\.[0-9]+)*(\.dev([0-9]+)?)?$/
             branches:
               ignore: /.*/
-      - build-osx-3.5:
+      - build-osx-3.7:
           filters:
             tags:
               only: /^[0-9]+(\.[0-9]+)*(\.dev([0-9]+)?)?$/
             branches:
               ignore: /.*/
-      - build-osx-3.4:
+      - build-osx-3.6:
           filters:
             tags:
               only: /^[0-9]+(\.[0-9]+)*(\.dev([0-9]+)?)?$/
             branches:
               ignore: /.*/
-      - build-osx-2.7:
+      - build-osx-3.5:
           filters:
             tags:
               only: /^[0-9]+(\.[0-9]+)*(\.dev([0-9]+)?)?$/

python/dwave_qbsolv/dimod_wrapper.py

@@ -95,13 +95,8 @@ def sample(self, bqm, num_repeats=50, seed=None, algorithm=None,
                                                verbosity=verbosity, timeout=timeout, solver_limit=solver_limit,
                                                solver=solver, target=target, find_max=find_max, sample_kwargs=sample_kwargs)
 
-        if hasattr(dimod.Response, 'from_dicts'):
-            # dimod<=0.6.x
-            response = dimod.Response.from_dicts(samples, {'energy': energies, 'num_occurrences': counts}, dimod.BINARY)
-            response.change_vartype(bqm.vartype, {'energy': [offset] * len(energies)})
-        else:
-            # dimod>=0.7.x
-            response = dimod.Response.from_samples(samples, {'energy': energies, 'num_occurrences': counts}, {}, dimod.BINARY)
-            response.change_vartype(bqm.vartype, energy_offset=offset)
+        response = dimod.SampleSet.from_samples(samples, energy=energies,
+                                                num_occurrences=counts, vartype=dimod.BINARY)
+        response.change_vartype(bqm.vartype, energy_offset=offset)
 
         return response

setup.py

@@ -71,14 +71,14 @@ def build_extensions(self):
     'Programming Language :: Python :: 3.7',
     ]
 
-python_requires = '>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*'
+python_requires = '>=3.5'
 
 setup(
     name='dwave-qbsolv',
-    version='0.2.10',
+    version='0.3.0',
     packages=packages,
     package_dir={'dwave_qbsolv': 'python/dwave_qbsolv'},
-    install_requires=['dimod>=0.6.10,<0.9.0'],
+    install_requires=['dimod>=0.8.1,<0.10.0'],
     ext_modules=extensions,
     cmdclass={'build_ext': build_ext_compiler_check},
     long_description=open('README.rst').read(),