From 684aebc8d42eeb7e29ec466e0e459e4034befac6 Mon Sep 17 00:00:00 2001 From: Theodor Isacsson Date: Thu, 25 Jul 2024 14:18:51 -0700 Subject: [PATCH 1/5] Update package versions --- dwaveoceansdk/__init__.py | 2 +- setup.cfg | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dwaveoceansdk/__init__.py b/dwaveoceansdk/__init__.py index 72d9a569..a51e42f9 100644 --- a/dwaveoceansdk/__init__.py +++ b/dwaveoceansdk/__init__.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = '7.0.0' +__version__ = '7.1.0' diff --git a/setup.cfg b/setup.cfg index f662a03a..663d8770 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,20 +26,20 @@ description = Software development kit for open source D-Wave tools [options] install_requires = - dimod==0.12.15 - dwave-cloud-client==0.12.0 + dimod==0.12.16 + dwave-cloud-client==0.12.1 dwave-greedy==0.3.0 dwave-hybrid==0.6.11 dwave-inspector==0.5.0.post0 dwave-neal==0.6.0 dwave-networkx==0.8.15 - dwave-optimization==0.1.0 - dwave-preprocessing==0.6.5 - dwave-samplers==1.2.0 + dwave-optimization==0.2.0 + dwave-preprocessing==0.6.6 + dwave-samplers==1.3.0 dwave-system==1.25.0 dwave-tabu==0.5.0 dwavebinarycsp==0.3.0 - minorminer==0.2.14 + minorminer==0.2.15 penaltymodel==1.1.0 # exclude pyqubo until it supports py312 # pyqubo==1.4.0 @@ -48,4 +48,4 @@ python_requires = >=3.8 [options.extras_require] all = - dwave-gate==0.3.1 + dwave-gate==0.3.2 From e1c5b892d77c5659e748de8e44e2f5f096c96cc6 Mon Sep 17 00:00:00 2001 From: Theodor Isacsson Date: Thu, 25 Jul 2024 14:26:18 -0700 Subject: [PATCH 2/5] Update submodule to latest releases --- dimod | 2 +- dwave-cloud-client | 2 +- dwave-gate | 2 +- dwave-optimization | 2 +- dwave-preprocessing | 2 +- dwave-samplers | 2 +- minorminer | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dimod b/dimod index 238914c3..75061361 160000 --- a/dimod +++ b/dimod @@ -1 +1 @@ -Subproject commit 238914c3d95b2774c682f80b61cece65263bd55b +Subproject commit 7506136125eeaa63b86ddc1e19d3746e56dc553e diff --git a/dwave-cloud-client b/dwave-cloud-client index 30d69493..55237914 160000 --- a/dwave-cloud-client +++ b/dwave-cloud-client @@ -1 +1 @@ -Subproject commit 30d69493a5f3b3fdaeeda872d253d5b735ad8fa0 +Subproject commit 552379144f37513c1f1b2194b9e96af377b67f2a diff --git a/dwave-gate b/dwave-gate index a8cc8a33..cebaeebc 160000 --- a/dwave-gate +++ b/dwave-gate @@ -1 +1 @@ -Subproject commit a8cc8a331c57b10794a5cacb7034e62dc16402cd +Subproject commit cebaeebccb1538bba65f00f9d8ece3146e9d770e diff --git a/dwave-optimization b/dwave-optimization index 714a2138..90d5ad45 160000 --- a/dwave-optimization +++ b/dwave-optimization @@ -1 +1 @@ -Subproject commit 714a213826e39d6a499bde599199ef97b858449c +Subproject commit 90d5ad4523217580ff6e25aaf747fbac78462473 diff --git a/dwave-preprocessing b/dwave-preprocessing index bcc4eb61..607adabd 160000 --- a/dwave-preprocessing +++ b/dwave-preprocessing @@ -1 +1 @@ -Subproject commit bcc4eb6156d439dcbcc4820c8f2b36405d8da7d4 +Subproject commit 607adabd2d39d4fe2378cb06ebe2b98f6069e54f diff --git a/dwave-samplers b/dwave-samplers index fc44d915..4028a092 160000 --- a/dwave-samplers +++ b/dwave-samplers @@ -1 +1 @@ -Subproject commit fc44d91571a4b23acc216e69eda935747aff4bbd +Subproject commit 4028a0920826fef57b9009a6a412811750064c60 diff --git a/minorminer b/minorminer index 23aedc40..2ff34255 160000 --- a/minorminer +++ b/minorminer @@ -1 +1 @@ -Subproject commit 23aedc401fd4cea86c253ebb864c0d859d20f5fd +Subproject commit 2ff342553448e5baacb98c69ca0b8a552b8ccdf3 From cfd6ef6ebea9e753d10d40f3a73ed5e29871e0c8 Mon Sep 17 00:00:00 2001 From: Theodor Isacsson Date: Thu, 25 Jul 2024 14:38:54 -0700 Subject: [PATCH 3/5] Promote dwave-gate from extra --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 663d8770..c658193b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,6 +28,7 @@ description = Software development kit for open source D-Wave tools install_requires = dimod==0.12.16 dwave-cloud-client==0.12.1 + dwave-gate==0.3.2 dwave-greedy==0.3.0 dwave-hybrid==0.6.11 dwave-inspector==0.5.0.post0 @@ -48,4 +49,3 @@ python_requires = >=3.8 [options.extras_require] all = - dwave-gate==0.3.2 From 77e4eee1f73c838175e481d346f22be2e280c261 Mon Sep 17 00:00:00 2001 From: Theodor Isacsson Date: Thu, 25 Jul 2024 14:56:33 -0700 Subject: [PATCH 4/5] Bound numpy<2.0 for doctest --- docs/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/requirements.txt b/docs/requirements.txt index 46547744..68f46ecf 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -3,6 +3,7 @@ sphinx==7.3.7 sphinx-design==0.5.0 sphinx-copybutton==0.5.0 reno[sphinx]==3.3.0 +numpy<2.0 # needed for some of the examples matplotlib From cb0fa3f18cce1236835010c3f13b2cf9c0b789b4 Mon Sep 17 00:00:00 2001 From: Theodor Isacsson Date: Thu, 25 Jul 2024 14:58:12 -0700 Subject: [PATCH 5/5] Add autodoc alias for ArrayLike --- docs/conf.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 4c307302..29a43dd9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -135,15 +135,15 @@ breathe_default_members = ('members', ) breathe_default_project = "minorminer" -# we want to build the c++ docs in RTD with all warnings: +# we want to build the c++ docs in RTD with all warnings: if os.environ.get('READTHEDOCS', False): subprocess.call('cd ../minorminer/docs/; make cpp', shell=True) subprocess.call('cd ../dimod/docs/; make cpp', shell=True) subprocess.call('cd ../dwave-preprocessing/docs/; make cpp', shell=True) subprocess.call('cd ../dwave-gate/; python dwave/gate/simulator/operation_generation.py', shell=True) -# we want to build the c++ docs in CircleCI without warnings -# and without minorminer because it generates ~500 warnings +# we want to build the c++ docs in CircleCI without warnings +# and without minorminer because it generates ~500 warnings if os.environ.get('CI', False): os.environ["DOXYGEN_QUIET"] = "YES" os.environ["DOXYGEN_WARNINGS"] = "NO" @@ -153,6 +153,10 @@ subprocess.call('cd ../dwave-preprocessing/docs/; make cpp > /dev/null 2>&1', shell=True) subprocess.call('cd ../dwave-gate/; python dwave/gate/simulator/operation_generation.py', shell=True) +autodoc_type_aliases = { + 'numpy.typing.ArrayLike': 'numpy.typing.ArrayLike', +} + # -- Options for HTML output ---------------------------------------------- html_theme = 'pydata_sphinx_theme' @@ -160,7 +164,7 @@ # Temporary for current pydata_sphinx_theme==0.8. Will update per # https://pydata-sphinx-theme.readthedocs.io/en/stable/user_guide/branding.html#add-favicons -# when https://github.com/dwavesystems/dwave-ocean-sdk/pull/274 is merged +# when https://github.com/dwavesystems/dwave-ocean-sdk/pull/274 is merged html_favicon = 'https://www.dwavesys.com/favicon.ico' html_theme_options = { @@ -185,7 +189,7 @@ ], "collapse_navigation": True, "header_links_before_dropdown": 8, - "navbar_align": "left", + "navbar_align": "left", "show_prev_next": False, "logo": { "image_light": "_static/Ocean.svg",