Skip to content

Commit

Permalink
Merge pull request #656 from meeseeksmachine/auto-backport-of-pr-654-…
Browse files Browse the repository at this point in the history
…on-2.2

Backport PR #654 on branch 2.2 (Fix devdeps figure tests and getting the wrong filename)
  • Loading branch information
nabobalis committed Dec 6, 2023
2 parents 51073e6 + 6170637 commit cd91c86
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions ndcube/tests/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ def get_hash_library_name():
Generate the hash library name for this env.
"""
ft2_version = f"{mpl.ft2font.__freetype_version__.replace('.', '')}"
animators_version = "dev" if "dev" in mpl_animators.__version__ else mpl_animators.__version__.replace('.', '')
mpl_version = "dev" if "+" in mpl.__version__ else mpl.__version__.replace('.', '')
astropy_version = "dev" if "dev" in astropy.__version__ else astropy.__version__.replace('.', '')
animators_version = "dev" if (("dev" in mpl_animators.__version__) or ("rc" in mpl_animators.__version__)) else mpl_animators.__version__.replace('.', '')
mpl_version = "dev" if (("dev" in mpl.__version__) or ("rc" in mpl.__version__)) else mpl.__version__.replace('.', '')
astropy_version = "dev" if (("dev" in astropy.__version__) or ("rc" in astropy.__version__)) else astropy.__version__.replace('.', '')
return f"figure_hashes_mpl_{mpl_version}_ft_{ft2_version}_astropy_{astropy_version}_animators_{animators_version}.json"


Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ setenv =
COLUMNS = 180
PYTEST_COMMAND = pytest -vvv -s -raR --pyargs ndcube --cov-report=xml --cov=ndcube --cov-config={toxinidir}/setup.cfg {toxinidir}/docs
PARFIVE_HIDE_PROGESS = True
devdeps: PIP_EXTRA_INDEX_URL = "https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scipy-wheels-nightly/simple"
devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
passenv =
HTTP_PROXY
HTTPS_PROXY
Expand Down

0 comments on commit cd91c86

Please sign in to comment.