Merge pull request #127 from arcondello/dimod0.7.x

dimod>=0.6.10,<0.8.0

Author: arcondello

python/dwave_qbsolv/dimod_wrapper.py

@@ -90,8 +90,13 @@ 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)
 
-        # load the response
-        response = dimod.Response.from_dicts(samples, {'energy': energies, 'num_occurrences': counts}, dimod.BINARY)
-        response.change_vartype(bqm.vartype, {'energy': [offset] * len(energies)})
+        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)
 
         return response

python/requirements.txt

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

setup.py

@@ -75,10 +75,10 @@ def build_extensions(self):
 
 setup(
     name='dwave_qbsolv',
-    version='0.2.8',
+    version='0.2.9',
     packages=packages,
     package_dir={'dwave_qbsolv': 'python/dwave_qbsolv'},
-    install_requires=['dimod>=0.6.10,<0.7.0'],
+    install_requires=['dimod>=0.6.10,<0.8.0'],
     ext_modules=extensions,
     cmdclass={'build_ext': build_ext_compiler_check},
     long_description=open('readme.md').read(),