From 2b8fc28a286a9f1fad55ce9749f98b9f32024522 Mon Sep 17 00:00:00 2001 From: Brett Date: Wed, 28 Feb 2024 09:11:30 -0500 Subject: [PATCH 1/3] enable no:legacypath pytest option --- ci_watson/plugin.py | 6 +++--- setup.cfg | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci_watson/plugin.py b/ci_watson/plugin.py index 2e7829a..286ecb4 100644 --- a/ci_watson/plugin.py +++ b/ci_watson/plugin.py @@ -67,12 +67,12 @@ def pytest_runtest_setup(item): @pytest.fixture(scope='function') -def _jail(tmpdir): +def _jail(tmp_path): """Perform test in a pristine temporary working directory.""" old_dir = os.getcwd() - os.chdir(tmpdir.strpath) + os.chdir(tmp_path) try: - yield tmpdir.strpath + yield str(tmp_path) finally: os.chdir(old_dir) diff --git a/setup.cfg b/setup.cfg index 25691c3..49c9736 100644 --- a/setup.cfg +++ b/setup.cfg @@ -59,3 +59,4 @@ junit_family = xunit2 filterwarnings = error ignore:numpy.ndarray size changed:RuntimeWarning +addopts = "-p no:legacypth" From af4ab6a24e34e1e6022343a4107ec12d180d82e5 Mon Sep 17 00:00:00 2001 From: Brett Date: Wed, 28 Feb 2024 10:38:35 -0500 Subject: [PATCH 2/3] add pyerfa dev to tox devdeps --- tox.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index d2780a9..376ab6f 100644 --- a/tox.ini +++ b/tox.ini @@ -11,7 +11,7 @@ requires = passenv = HOME,CI setenv = - devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple + devdeps: PIP_EXTRA_INDEX_URL = https://pypi.anaconda.org/astropy/simple https://pypi.anaconda.org/scientific-python-nightly-wheels/simple https://pypi.anaconda.org/liberfa/simple # tox environments are constructed with so-called 'factors' (or terms) # separated by hyphens, e.g. test-devdeps-cov. Lines below starting with factor: @@ -33,6 +33,7 @@ extras = deps = devdeps: numpy>=0.0.dev0 + devdeps: pyerfa>=0.0.dev0 devdeps: astropy>=0.0.dev0 commands = From c0e852b8603a118e2ae56057a6f8243ff15f570d Mon Sep 17 00:00:00 2001 From: Brett Date: Wed, 28 Feb 2024 11:25:16 -0500 Subject: [PATCH 3/3] fix typo --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 49c9736..49ae25c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -59,4 +59,4 @@ junit_family = xunit2 filterwarnings = error ignore:numpy.ndarray size changed:RuntimeWarning -addopts = "-p no:legacypth" +addopts = "-p no:legacypath"