Merge pull request #533 from randomir/update-for-cloud-client-0.13

Update for cloud client 0.13

.circleci/config.yml

@@ -17,6 +17,8 @@ jobs:
     parameters:
       python-version:
         type: string
+      dependency-specifiers:
+        type: string
       integration-test-python-version:
         type: string
 
@@ -57,6 +59,15 @@ jobs:
             pip install -r tests/requirements.txt
             pip install .[drivers] -I --no-cache-dir --extra-index-url https://pypi.dwavesys.com/simple
 
+      - when:
+          condition: << parameters.dependency-specifiers >>
+          steps:
+            - run:
+                name: sweep dependencies
+                command: |
+                  . env/bin/activate
+                  pip install << parameters.dependency-specifiers >>
+
       - run: *run-python-tests
 
       - codecov/upload: &upload-python-code-coverage
@@ -220,10 +231,13 @@ workflows:
   test:
     jobs:
       - test-linux:
-          name: test-linux-<< matrix.python-version >>
+          name: test-linux-<< matrix.python-version >> | << matrix.dependency-specifiers >>
           matrix:
             parameters:
               python-version: &python-versions ["3.8", "3.9", "3.10", "3.11", &latest-python "3.12"]
+              dependency-specifiers:
+                - "dwave-cloud-client~=0.12.0"
+                - "dwave-cloud-client~=0.13.0"
               integration-test-python-version: &integration-python-versions [*latest-python]
 
       - test-osx:

dwave/system/samplers/clique.py

@@ -17,7 +17,6 @@
 
 import dimod
 import networkx as nx
-import dwave_networkx as dnx
 
 from minorminer.busclique import find_clique_embedding, busgraph_cache
 from dwave.preprocessing import ScaleComposite

dwave/system/samplers/dwave_sampler.py

@@ -26,7 +26,7 @@
 from typing import Optional, Dict
 
 import dimod
-
+import dwave_networkx as dnx
 from dimod.exceptions import BinaryQuadraticModelStructureError
 from dwave.cloud.client import Client
 from dwave.cloud.exceptions import (
@@ -38,8 +38,6 @@
 from dwave.system.exceptions import FailoverCondition, RetryCondition
 from dwave.system.warnings import WarningHandler, WarningAction
 
-import dwave_networkx as dnx
-
 __all__ = ['DWaveSampler', 'qpu_graph']
 
 
@@ -593,4 +591,3 @@ def to_networkx_graph(self):
         return qpu_graph(self.properties['topology']['type'],
                          self.properties['topology']['shape'],
                          self.nodelist, self.edgelist)
-

dwave/system/samplers/leap_hybrid_sampler.py

@@ -25,7 +25,7 @@
 import dimod
 import dwave.optimization
 import numpy
-from dwave.cloud import Client
+from dwave.cloud.client import Client
 
 from dwave.system.utilities import classproperty, FeatureFlags