Merge d8a5369 into ed583ec

.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

.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

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',

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

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
 

pydl/pydlutils/tests/test_trace.py

@@ -13,15 +13,15 @@ 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'))
         # extracted from spFrame-r1-00180406.fits
         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

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
@@ -29,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
@@ -39,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):
@@ -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):

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