From fefd7cfb5b84185965157bd60cc6bbd24c299613 Mon Sep 17 00:00:00 2001 From: Brice Kamhoua Date: Wed, 6 Sep 2023 13:05:52 +0100 Subject: [PATCH 1/3] Update README.md - FIx typo (#977) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 241b4315b..417e4ff29 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ any Python application. ## Project history -Rustworkx was originally called retworkx and was was created initially to be +Rustworkx was originally called retworkx and was created initially to be a replacement for [qiskit](https://qiskit.org/)'s previous (and current) networkx usage (hence the original name). The project was originally started to build a faster directed graph to use as the underlying data structure for From 0bea6cb09eab0d6319fca476d78ace71aceba3ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:28:02 -0400 Subject: [PATCH 2/3] Bump serde_json from 1.0.105 to 1.0.106 (#979) Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.105 to 1.0.106. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.105...v1.0.106) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e5352e03b..1478e92f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -680,9 +680,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" dependencies = [ "itoa", "ryu", From f685d856c1d5f3946647f770bc5dea2f3c1c9c10 Mon Sep 17 00:00:00 2001 From: Ivan Carvalho <8753214+IvanIsCoding@users.noreply.github.com> Date: Mon, 11 Sep 2023 13:03:18 -0400 Subject: [PATCH 3/3] Rename old `RETWORKX` environment variables (#976) * Replace old environment variables refering to retworkx * More flags --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- CONTRIBUTING.md | 4 ++-- docs/source/conf.py | 6 +++--- .../visualization/test_graphviz.py | 2 +- tests/retworkx_backwards_compat/visualization/test_mpl.py | 2 +- tests/rustworkx_tests/visualization/test_graphviz.py | 2 +- tests/rustworkx_tests/visualization/test_mpl.py | 2 +- tools/deploy_documentation_dev.sh | 2 +- tox.ini | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bd6ebdaa7..a04b2aaed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -172,12 +172,12 @@ not include any way to view the images from the visualization tests. If you want to inspect the output from the visualization tests (which is common if you're working on visualizations) you can set the -`RETWORKX_TEST_PRESERVE_IMAGES` environment variable to any value and this will +`RUSTWORKX_TEST_PRESERVE_IMAGES` environment variable to any value and this will skip the cleanup. This will enable you to look at the output image and ensure the visualization is correct. For example, running: ``` -RETWORKX_TEST_PRESERVE_IMAGES=1 tox -epy +RUSTWORKX_TEST_PRESERVE_IMAGES=1 tox -epy ``` will run the visualization tests and preserve the generated image files after diff --git a/docs/source/conf.py b/docs/source/conf.py index 0addab6ef..038c463b3 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -71,7 +71,7 @@ # Prepend warning for development docs: -if not os.getenv('RETWORKX_DEV_DOCS', None): +if not os.getenv('RUSTWORKX_DEV_DOCS', None): rst_prolog = """ .. raw:: html @@ -124,7 +124,7 @@ for source_str in fd: redirects[f"stubs/{source_str}"] = f"../apiref/{source_str}" -if os.getenv("RETWORKX_LEGACY_DOCS", None) is not None: +if os.getenv("RUSTWORKX_LEGACY_DOCS", None) is not None: redirects["*"] = "https://qiskit.org/ecosystem/rustworkx/$source.html" html_baseurl = "https://qiskit.org/ecosystem/rustworkx/" @@ -152,7 +152,7 @@ def _get_versions(app, config): def _get_version_label(current_version): - if not os.getenv('RETWORKX_DEV_DOCS', None): + if not os.getenv('RUSTWORKX_DEV_DOCS', None): current_version_info = current_version.split('.') return ".".join(current_version_info[:-1]) else: diff --git a/tests/retworkx_backwards_compat/visualization/test_graphviz.py b/tests/retworkx_backwards_compat/visualization/test_graphviz.py index 8a9ee6493..5d9039537 100644 --- a/tests/retworkx_backwards_compat/visualization/test_graphviz.py +++ b/tests/retworkx_backwards_compat/visualization/test_graphviz.py @@ -31,7 +31,7 @@ except Exception: HAS_PILLOW = False -SAVE_IMAGES = os.getenv("RETWORKX_TEST_PRESERVE_IMAGES", None) +SAVE_IMAGES = os.getenv("RUSTWORKX_TEST_PRESERVE_IMAGES", None) def _save_image(image, path): diff --git a/tests/retworkx_backwards_compat/visualization/test_mpl.py b/tests/retworkx_backwards_compat/visualization/test_mpl.py index eb5f4b5e9..4d600c19b 100644 --- a/tests/retworkx_backwards_compat/visualization/test_mpl.py +++ b/tests/retworkx_backwards_compat/visualization/test_mpl.py @@ -29,7 +29,7 @@ except ImportError: HAS_MPL = False -SAVE_IMAGES = os.getenv("RETWORKX_TEST_PRESERVE_IMAGES", None) +SAVE_IMAGES = os.getenv("RUSTWORKX_TEST_PRESERVE_IMAGES", None) def _save_images(fig, path): diff --git a/tests/rustworkx_tests/visualization/test_graphviz.py b/tests/rustworkx_tests/visualization/test_graphviz.py index af2733141..f0be1d562 100644 --- a/tests/rustworkx_tests/visualization/test_graphviz.py +++ b/tests/rustworkx_tests/visualization/test_graphviz.py @@ -31,7 +31,7 @@ except Exception: HAS_PILLOW = False -SAVE_IMAGES = os.getenv("RETWORKX_TEST_PRESERVE_IMAGES", None) +SAVE_IMAGES = os.getenv("RUSTWORKX_TEST_PRESERVE_IMAGES", None) def _save_image(image, path): diff --git a/tests/rustworkx_tests/visualization/test_mpl.py b/tests/rustworkx_tests/visualization/test_mpl.py index 001f0e658..312c857f6 100644 --- a/tests/rustworkx_tests/visualization/test_mpl.py +++ b/tests/rustworkx_tests/visualization/test_mpl.py @@ -29,7 +29,7 @@ except ImportError: HAS_MPL = False -SAVE_IMAGES = os.getenv("RETWORKX_TEST_PRESERVE_IMAGES", None) +SAVE_IMAGES = os.getenv("RUSTWORKX_TEST_PRESERVE_IMAGES", None) def _save_images(fig, path): diff --git a/tools/deploy_documentation_dev.sh b/tools/deploy_documentation_dev.sh index 123443a99..80ad47c8e 100755 --- a/tools/deploy_documentation_dev.sh +++ b/tools/deploy_documentation_dev.sh @@ -21,7 +21,7 @@ sudo apt-get install -y ./rclone.deb RCLONE_CONFIG_PATH=$(rclone config file | tail -1) # Build the documentation. -RETWORKX_DEV_DOCS=1 tox -edocs +RUSTWORKX_DEV_DOCS=1 tox -edocs echo "show current dir: " pwd diff --git a/tox.ini b/tox.ini index aeab7f94c..16649d6bc 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,7 @@ extras = mpl graphviz passenv = - RETWORKX_TEST_PRESERVE_IMAGES + RUSTWORKX_TEST_PRESERVE_IMAGES RUSTWORKX_PKG_NAME RUSTWORKX_DEBUG changedir = {toxinidir}/tests @@ -51,8 +51,8 @@ deps = -r {toxinidir}/docs/source/requirements.txt passenv = {[testenv]passenv} - RETWORKX_DEV_DOCS - RETWORKX_LEGACY_DOCS + RUSTWORKX_DEV_DOCS + RUSTWORKX_LEGACY_DOCS RUST_DEBUG changedir = {toxinidir}/docs commands =