From 925718dca2b6f58eacff6ed493ee0b6e901275d7 Mon Sep 17 00:00:00 2001 From: Benjamin Alan Weaver Date: Mon, 6 Mar 2023 15:29:59 -0700 Subject: [PATCH 1/6] Detect endianness and test accordingly. --- pydl/pydlutils/tests/test_yanny.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pydl/pydlutils/tests/test_yanny.py b/pydl/pydlutils/tests/test_yanny.py index 5b26911..aefa374 100644 --- a/pydl/pydlutils/tests/test_yanny.py +++ b/pydl/pydlutils/tests/test_yanny.py @@ -2,6 +2,8 @@ # -*- coding: utf-8 -*- import warnings import json +import stat +import sys from os import chmod, remove from os.path import exists, join from shutil import copy, rmtree @@ -82,7 +84,11 @@ def json2dtype(self, data): stuff.append(tuple([str(k[0]), str(k[1]), tuple(k[2])])) else: stuff.append(tuple([str(k[0]), str(k[1])])) - return np.dtype(stuff) + d = np.dtype(stuff) + if sys.byteorder == 'little': + return d + else: + return d.newbyteorder() class TestYanny(YannyTestCase): From 4c9b12670477a88540a732ca7c88e7f924332755 Mon Sep 17 00:00:00 2001 From: Benjamin Alan Weaver Date: Mon, 6 Mar 2023 15:41:05 -0700 Subject: [PATCH 2/6] fix warnings about deprecated test features --- pydl/pydlutils/tests/test_mangle.py | 5 +---- pydl/pydlutils/tests/test_sdss.py | 5 +---- pydl/pydlutils/tests/test_trace.py | 4 ++-- pydl/pydlutils/tests/test_yanny.py | 4 ++-- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pydl/pydlutils/tests/test_mangle.py b/pydl/pydlutils/tests/test_mangle.py index 4052851..ae13391 100644 --- a/pydl/pydlutils/tests/test_mangle.py +++ b/pydl/pydlutils/tests/test_mangle.py @@ -11,16 +11,13 @@ class TestMangle(object): """Test the functions in pydl.pydlutils.mangle. """ - def setup(self): + def setup_method(self): self.poly_fits = get_pkg_data_filename('t/polygon.fits') self.no_id_fits = get_pkg_data_filename('t/polygon_no_id.fits') self.one_cap_fits = get_pkg_data_filename('t/polygon_one_cap.fits') self.poly_ply = get_pkg_data_filename('t/polygon.ply') self.bad_ply = get_pkg_data_filename('t/median_data.txt') - def teardown(self): - pass - def test_ManglePolygon(self): # # Zero caps diff --git a/pydl/pydlutils/tests/test_sdss.py b/pydl/pydlutils/tests/test_sdss.py index 7f9ce52..b3e024c 100644 --- a/pydl/pydlutils/tests/test_sdss.py +++ b/pydl/pydlutils/tests/test_sdss.py @@ -13,7 +13,7 @@ class TestSDSS(object): """Test the functions in pydl.pydlutils.sdss. """ - def setup(self): + def setup_method(self): pydl.pydlutils.sdss.maskbits = set_maskbits( maskbits_file=get_pkg_data_filename('t/testMaskbits.par')) self.opbadfields = np.array([ @@ -28,9 +28,6 @@ def setup(self): pydl.pydlutils.sdss.opbadfields = self.opbadfields return - def teardown(self): - pass - def test_default_skyversion(self): assert default_skyversion() == 2 diff --git a/pydl/pydlutils/tests/test_trace.py b/pydl/pydlutils/tests/test_trace.py index 32ff3b4..3c0fda9 100644 --- a/pydl/pydlutils/tests/test_trace.py +++ b/pydl/pydlutils/tests/test_trace.py @@ -13,7 +13,7 @@ class TestTrace(object): """Test the functions in pydl.pydlutils.trace. """ - def setup(self): + def setup_method(self): # extracted from spFrame-b1-00057618.fits self.sdss = fits.open(get_pkg_data_filename('t/sdss_traceset.fits')) @@ -21,7 +21,7 @@ def setup(self): self.boss = fits.open(get_pkg_data_filename('t/boss_traceset.fits')) return - def teardown(self): + def teardown_method(self): self.sdss.close() self.boss.close() return diff --git a/pydl/pydlutils/tests/test_yanny.py b/pydl/pydlutils/tests/test_yanny.py index aefa374..3474aec 100644 --- a/pydl/pydlutils/tests/test_yanny.py +++ b/pydl/pydlutils/tests/test_yanny.py @@ -31,7 +31,7 @@ class YannyTestCase(object): """ save_temp = False - def setup(self): + def setup_method(self): self.temp_dir = mkdtemp(prefix='yanny-test-') # Ignore deprecation warnings--this only affects Python 2.5 and 2.6, # since deprecation warnings are ignored by defualt on 2.7 @@ -41,7 +41,7 @@ def setup(self): with open(get_pkg_data_filename("t/yanny_data.json")) as js: self.test_data = json.load(js) - def teardown(self): + def teardown_method(self): warnings.resetwarnings() if not self.save_temp: if hasattr(self, 'temp_dir') and exists(self.temp_dir): From f9111656364f48f600ea48bf5954414044ffff15 Mon Sep 17 00:00:00 2001 From: Benjamin Alan Weaver Date: Mon, 6 Mar 2023 15:55:44 -0700 Subject: [PATCH 3/6] try tox 3 --- .github/workflows/ci_cron_weekly.yml | 2 +- .github/workflows/ci_tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_cron_weekly.yml b/.github/workflows/ci_cron_weekly.yml index 0e083d8..ae7be29 100644 --- a/.github/workflows/ci_cron_weekly.yml +++ b/.github/workflows/ci_cron_weekly.yml @@ -21,7 +21,7 @@ jobs: - name: Install base dependencies run: | python -m pip install --upgrade pip - python -m pip install tox + python -m pip install tox\<4 - name: Check links in docs using tox run: | tox -e linkcheck diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index e8b7962..a171155 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -74,7 +74,7 @@ jobs: - name: Install base dependencies run: | python -m pip install --upgrade pip - python -m pip install tox coveralls + python -m pip install tox\<4 coveralls - name: Install graphviz dependency if: "endsWith(matrix.toxenv, 'build_docs')" run: sudo apt-get -y install graphviz From fb9d586e7b35f020e082566fc02622b2c0d1876e Mon Sep 17 00:00:00 2001 From: Benjamin Alan Weaver Date: Mon, 6 Mar 2023 16:04:29 -0700 Subject: [PATCH 4/6] also pin in tox.ini --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 574a660..40f1695 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,7 @@ requires = setuptools >= 30.3.0 pip >= 19.3.1 setuptools_scm + tox < 4 tox-pypi-filter >= 0.12 isolated_build = true From 16143c3892495a00690d9078395c4b36a9935c84 Mon Sep 17 00:00:00 2001 From: Benjamin Alan Weaver Date: Mon, 6 Mar 2023 16:10:11 -0700 Subject: [PATCH 5/6] try fixing test on windows --- .github/workflows/ci_cron_weekly.yml | 2 +- .github/workflows/ci_tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_cron_weekly.yml b/.github/workflows/ci_cron_weekly.yml index ae7be29..a135b2c 100644 --- a/.github/workflows/ci_cron_weekly.yml +++ b/.github/workflows/ci_cron_weekly.yml @@ -21,7 +21,7 @@ jobs: - name: Install base dependencies run: | python -m pip install --upgrade pip - python -m pip install tox\<4 + python -m pip install "tox<4" - name: Check links in docs using tox run: | tox -e linkcheck diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index a171155..ad494dc 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -74,7 +74,7 @@ jobs: - name: Install base dependencies run: | python -m pip install --upgrade pip - python -m pip install tox\<4 coveralls + python -m pip install "tox<4" coveralls - name: Install graphviz dependency if: "endsWith(matrix.toxenv, 'build_docs')" run: sudo apt-get -y install graphviz From d8a536988ac95b035c711678a67d84ab86ac24eb Mon Sep 17 00:00:00 2001 From: Benjamin Alan Weaver Date: Tue, 7 Mar 2023 13:46:18 -0700 Subject: [PATCH 6/6] iaxis to axis --- pydl/pydlspec2d/spec2d.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pydl/pydlspec2d/spec2d.py b/pydl/pydlspec2d/spec2d.py index 28bfb83..3c24173 100644 --- a/pydl/pydlspec2d/spec2d.py +++ b/pydl/pydlspec2d/spec2d.py @@ -436,7 +436,7 @@ def filter_thru(flux, waveimg=None, wset=None, mask=None, pixnorm, logdiff = traceset2xy(diffset) logdiff = np.absolute(logdiff) if mask is not None: - flux_interp = djs_maskinterp(flux, mask, iaxis=0) + flux_interp = djs_maskinterp(flux, mask, axis=0) res = np.zeros((nTrace, len(ffiles)), dtype=flux.dtype) for i, f in enumerate(ffiles): filter_data = ascii.read(f, comment='#.*', names=('lam', 'respt',