Skip to content

Commit

Permalink
Merge pull request #302 from thisac/release/7.1.0
Browse files Browse the repository at this point in the history
Update packages for 7.1.0
  • Loading branch information
thisac authored Jul 25, 2024
2 parents f4ea98f + cb0fa3f commit fb7c99e
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 20 deletions.
2 changes: 1 addition & 1 deletion dimod
Submodule dimod updated 42 files
+14 −5 .circleci/config.yml
+1 −1 dimod/__init__.py
+3 −1 dimod/binary/binary_quadratic_model.py
+0 −2 dimod/binary/cybqm/cybqm_float32.pxd
+0 −2 dimod/binary/cybqm/cybqm_float64.pxd
+3 −3 dimod/binary/cybqm/cybqm_template.pxd.pxi
+12 −11 dimod/binary/cybqm/cybqm_template.pyx.pxi
+0 −2 dimod/constrained/cyconstrained.pxd
+3 −4 dimod/constrained/cyconstrained.pyx
+4 −5 dimod/constrained/cyexpression.pyx
+2 −1 dimod/core/structured.py
+3 −3 dimod/cyqmbase/cyqmbase_float32.pxd
+3 −3 dimod/cyqmbase/cyqmbase_float64.pxd
+4 −4 dimod/cyqmbase/cyqmbase_template.pyx.pxi
+1 −44 dimod/cyutilities.pxd
+15 −26 dimod/cyutilities.pyx
+2 −2 dimod/decorators.py
+9 −35 dimod/discrete/cydiscrete_quadratic_model.pxd
+16 −12 dimod/discrete/cydiscrete_quadratic_model.pyx
+6 −0 dimod/discrete/discrete_quadratic_model.py
+4 −4 dimod/generators/wireless.py
+1 −1 dimod/lp.py
+0 −2 dimod/quadratic/cyqm/cyqm_float32.pxd
+0 −2 dimod/quadratic/cyqm/cyqm_float64.pxd
+6 −5 dimod/quadratic/cyqm/cyqm_template.pyx.pxi
+2 −2 dimod/quadratic/quadratic_model.py
+1 −1 dimod/reference/composites/structure.py
+1 −1 dimod/reference/samplers/identity_sampler.py
+1 −1 dimod/reference/samplers/random_sampler.py
+1 −1 dimod/reference/samplers/simulated_annealing.py
+8 −3 dimod/sampleset.py
+1 −1 dimod/sym.py
+4 −4 dimod/testing/asserts.py
+53 −0 dimod/typing.pxd
+1 −1 dimod/variables.py
+2 −2 dimod/views/quadratic.py
+5 −5 docs/intro/intro_scaling.rst
+0 −1 pyproject.toml
+23 −0 releasenotes/notes/remove-numpy-build-dependency-9a5cd6a9661dcde7.yaml
+5 −0 releasenotes/notes/smaller-wheels-ee4d7c548b83ff29.yaml
+1 −1 requirements.txt
+4 −9 setup.py
14 changes: 9 additions & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -153,14 +153,18 @@
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'
html_logo = "_static/Ocean.svg"

# 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 = {
Expand All @@ -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",
Expand Down
1 change: 1 addition & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dwave-optimization
Submodule dwave-optimization updated 46 files
+75 −2 .circleci/config.yml
+1 −0 docs/_images/to_networkx_example.svg
+13 −32 docs/conf.py
+0 −1 docs/index.rst
+4 −4 docs/intro.rst
+1 −12 docs/reference/generators.rst
+9 −0 docs/reference/models.rst
+34 −61 docs/reference/symbols.rst
+2 −2 docs/requirements.txt
+2 −6 dwave/optimization/__init__.py
+266 −241 dwave/optimization/generators.py
+5 −3 dwave/optimization/include/dwave-optimization/nodes/collections.hpp
+7 −9 dwave/optimization/include/dwave-optimization/nodes/mathematical.hpp
+4 −4 dwave/optimization/libcpp/nodes.pxd
+108 −82 dwave/optimization/mathematical.py
+33 −0 dwave/optimization/model.pxd
+3 −0 dwave/optimization/model.pyi
+443 −342 dwave/optimization/model.pyx
+51 −16 dwave/optimization/src/nodes/collections.cpp
+34 −5 dwave/optimization/src/nodes/mathematical.cpp
+18 −1 dwave/optimization/symbols.pyi
+498 −310 dwave/optimization/symbols.pyx
+0 −2 pyproject.toml
+4 −0 releasenotes/notes/NaryOpNode-from-Array-pointers-bdf7c53f9850d9c2.yaml
+5 −0 releasenotes/notes/add-num_edges-4569f47ca86590de.yaml
+5 −0 releasenotes/notes/add-quadratic-assignment_generator-6955619da329e057.yaml
+4 −0 releasenotes/notes/add_rotate_in_disjoint_list-6163854fad6013ad.yaml
+6 −0 releasenotes/notes/constant-comparisons-5258fa0aeb7f435e.yaml
+3 −0 releasenotes/notes/fix-ArraySymbol.all-adc9381c654b1d1d.yaml
+3 −0 releasenotes/notes/fix-disjointbitset-state-copy-0f1760e77330ba6d.yaml
+9 −0 releasenotes/notes/fix-to_networkx-a78f0f669cc9638c.yaml
+6 −0 releasenotes/notes/generators-refactor-e68b0281c70daed3.yaml
+16 −0 releasenotes/notes/improve-operators-54e60d66200526cc.yaml
+14 −0 releasenotes/notes/mathematical-typing-fd454b6bce48d9e5.yaml
+3 −0 releasenotes/notes/maybe_equals-return-type-dd06bd6f8b2f31f3.yaml
+3 −0 releasenotes/notes/numpy-2.0-4cd6cab7c1f420bb.yaml
+5 −0 releasenotes/notes/refactor-node-discovery-f468e7dc54fcfbdc.yaml
+1 −1 setup.cfg
+0 −8 setup.py
+51 −23 tests/cpp/tests/test_nodes_collections.cpp
+50 −0 tests/cpp/tests/test_nodes_mathematical.cpp
+1 −1 tests/requirements.txt
+3 −496 tests/test_examples.py
+543 −237 tests/test_generators.py
+125 −0 tests/test_model.py
+465 −216 tests/test_symbols.py
2 changes: 1 addition & 1 deletion dwaveoceansdk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion minorminer
14 changes: 7 additions & 7 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,21 @@ 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-gate==0.3.2
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
Expand All @@ -48,4 +49,3 @@ python_requires = >=3.8

[options.extras_require]
all =
dwave-gate==0.3.1

0 comments on commit fb7c99e

Please sign in to comment.