Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into swap-nox-tox
Browse files Browse the repository at this point in the history
  • Loading branch information
IvanIsCoding committed Sep 12, 2023
2 parents 9cc214e + f685d85 commit 0582176
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 nox -e test
RUSTWORKX_TEST_PRESERVE_IMAGES=1 nox -e test
```
will run the visualization tests and preserve the generated image files after
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/"

Expand Down Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion tests/retworkx_backwards_compat/visualization/test_mpl.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion tests/rustworkx_tests/visualization/test_graphviz.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion tests/rustworkx_tests/visualization/test_mpl.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion tools/deploy_documentation_dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 nox -e docs
RUSTWORKX_DEV_DOCS=1 nox -e docs

echo "show current dir: "
pwd
Expand Down

0 comments on commit 0582176

Please sign in to comment.