DM-23172: modernize code and setup.cfg

python/astshim/__init__.py

@@ -22,7 +22,6 @@
 
 """lsst.astshim
 """
-from __future__ import absolute_import
 from .base import *
 from .object import *
 from .stream import *

python/astshim/detail/__init__.py

@@ -1,3 +1 @@
-from __future__ import absolute_import
-
 from .testUtils import *

python/astshim/fitsChanContinued.py

@@ -1,5 +1,6 @@
-from .fitsChan import FitsChan, CardType
-from .fitsChan import *  # noqa: F403 F401
+__all__ = ["CardType", "FitsChan", "FitsKeyState"]
+
+from .fitsChan import CardType, FitsChan, FitsKeyState
 
 
 def _calc_card_pos(self, index):
@@ -281,9 +282,9 @@ def setitem(self, name, value):
     try:
         self.clearCard()
 
-        # Look for a card with the specified name
-        # We do not care about the result, if nothing is found we will be at the
-        # end of the header
+        # Look for a card with the specified name.
+        # We do not care about the result; if nothing is found we will be
+        # at the end of the header.
         self.findFits(name, False)
 
         # pyast seems to want to delete items if the value is None but
@@ -297,7 +298,7 @@ def setitem(self, name, value):
         elif isinstance(value, bool):
             self.setFitsL(name, value, overwrite=True)
         else:
-            # Force to string
+            # Force to string.
             self.setFitsS(name, str(value), overwrite=True)
 
         # Delete any later cards with matching keyword

python/astshim/fitsTableContinued.py

@@ -1,6 +1,7 @@
-from .fitsTable import *  # noqa: F401 F403
+__all__ = ["FitsTable", "getColumnData"]
+
+from . import base
 from .fitsTable import FitsTable
-from .base import DataType as _DataType
 
 
 def getColumnData(self, column):
@@ -20,7 +21,7 @@ def getColumnData(self, column):
     shape = self.columnShape(column)
     dtype = self.columnType(column)
 
-    if dtype == _DataType.DoubleType:
+    if dtype == base.DataType.DoubleType:
         newshape = list(shape)
         newshape.append(nrows)
         coldata = self.getColumnData1D(column)

python/astshim/keyMap/__init__.py

@@ -20,7 +20,5 @@
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #/
 
-from __future__ import absolute_import
-from .keyMap import *
 from .keyMapContinued import *
 

python/astshim/keyMap/keyMapContinued.py

@@ -1,9 +1,7 @@
-from __future__ import absolute_import, division, print_function
+__all__ = ["KeyMap"]
 
 from .keyMap import KeyMap
 
-__all__ = []  # import only for side effects
-
 
 def keys(self):
     for i in range(len(self)):

python/astshim/test.py

@@ -136,8 +136,10 @@ def checkBasicSimplify(self, amap):
         """Check basic simplfication for a reversible mapping
 
         Check the following:
-        - A compound mapping of a amap and its inverse simplifies to a unit amap
-        - A compound mapping of a amap and a unit amap simplifies to the original amap
+        - A compound mapping of a amap and its inverse simplifies to
+          a unit amap.
+        - A compound mapping of a amap and a unit amap simplifies to
+          the original amap.
         """
         amapinv = amap.inverted()
         cmp1 = amap.then(amapinv)
@@ -220,7 +222,8 @@ def checkMemoryForCompoundObject(self, obj1, obj2, cmpObj, isSeries):
         obj1: first object in compound object
         obj2: second object in compound object
         cmpObj: compound object (SeriesMap, ParallelMap, CmpMap or CmpFrame)
-        isSeries: is compound object in series? None to not test (e.g. CmpFrame)
+        isSeries: is compound object in series? None to not test
+          (e.g. CmpFrame)
         """
         # if obj1 and obj2 are the same type then copying the compound object
         # will increase the NObject of each by 2, otherwise 1
@@ -240,8 +243,8 @@ def checkMemoryForCompoundObject(self, obj1, obj2, cmpObj, isSeries):
             elif isSeries is False:
                 self.assertFalse(cmpObj.series)
 
-        # making a deep copy should increase the object count of the contained objects
-        # but should not affect the reference count
+        # Making a deep copy should increase the object count of the contained
+        # objects but should not affect the reference count.
         cp = cmpObj.copy()
         self.assertEqual(cmpObj.getRefCount(), initialRefCountCmpObj)
         self.assertEqual(cmpObj.getNObject(), initialNumCmpObj + 1)
@@ -261,7 +264,8 @@ def checkMemoryForCompoundObject(self, obj1, obj2, cmpObj, isSeries):
 
 
 def makePolyMapCoeffs(nIn, nOut):
-    """Make an array of coefficients for astshim.PolyMap for the following equation:
+    """Make an array of coefficients for astshim.PolyMap for the following
+    equation:
 
     fj(x) = C0j x0^2 + C1j x1^2 + C2j x2^2 + ... + CNj xN^2
     where:
@@ -284,15 +288,17 @@ def makeTwoWayPolyMap(nIn, nOut):
     """Make an astshim.PolyMap suitable for testing
 
     The forward transform is as follows:
-    fj(x) = C0j x0^2 + C1j x1^2 + C2j x2^2 + ... + CNj xN^2 where Cij = 0.001 (i+j+1)
+    fj(x) = C0j x0^2 + C1j x1^2 + C2j x2^2 + ...
+            + CNj xN^2 where Cij = 0.001 (i+j+1)
 
     The reverse transform is the same equation with i and j reversed
     thus it is NOT the inverse of the forward direction,
     but is something that can be easily evaluated.
 
     The equation is chosen for the following reasons:
-    - It is well defined for any positive value of nIn, nOut
-    - It stays small for small x, to avoid wraparound of angles for SpherePoint endpoints
+    - It is well defined for any positive value of nIn, nOut.
+    - It stays small for small x, to avoid wraparound of angles for
+      SpherePoint endpoints.
     """
     forwardCoeffs = makePolyMapCoeffs(nIn, nOut)
     reverseCoeffs = makePolyMapCoeffs(nOut, nIn)
@@ -311,8 +317,9 @@ def makeForwardPolyMap(nIn, nOut):
     This map does not have a reverse transform.
 
     The equation is chosen for the following reasons:
-    - It is well defined for any positive value of nIn, nOut
-    - It stays small for small x, to avoid wraparound of angles for SpherePoint endpoints
+    - It is well defined for any positive value of nIn, nOut.
+    - It stays small for small x, to avoid wraparound of angles for
+      SpherePoint endpoints.
     """
     forwardCoeffs = makePolyMapCoeffs(nIn, nOut)
     polyMap = PolyMap(forwardCoeffs, nOut, "IterInverse=0")

setup.cfg

@@ -1,8 +1,9 @@
 [flake8]
 max-line-length = 110
-ignore = E133, E226, E228, N802, N803, N806, N812, N816
+max-doc-length = 79
+ignore = E133, E226, E228, N802, N803, N806, N812, N813, N815, N816, W503
 exclude = __init__.py
 
 [tool:pytest]
 addopts = --flake8
-flake8-ignore = E133 E226 E228 N802 N803 N806 N812 N816
+flake8-ignore = E133 E226 E228 N802 N803 N806 N812 N813 N815 N816 W503

tests/test_append.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import unittest
 from numpy.testing import assert_allclose
 
@@ -122,7 +121,8 @@ def test_AppendIndependent(self):
         self.assertEqual(set12.applyForward(x), y)
 
     def test_AppendMismatch(self):
-        """Check that append behaves as expected when joining non-identical frames.
+        """Check that append behaves as expected when joining non-identical
+        frames.
         """
         set1 = self.makeFrameSet(3, 2)
         set2 = self.makeFrameSet(2, 3)

tests/test_base.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import unittest
 
 import numpy as np
@@ -23,7 +22,8 @@ def test_arrayFromVector(self):
         dataArr2 = ast.arrayFromVector(vec=list(dataVec), nAxes=nAxes)
         assert_equal(dataArr2, desiredDataArr)
 
-        # make sure dataArr is a deep copy; changing dataVec should not change dataArr
+        # make sure dataArr is a deep copy; changing dataVec should
+        # not change dataArr
         dataVec[0] += 10
         assert_equal(dataArr, desiredDataArr)
 

tests/test_channel.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import filecmp
 import os
 import unittest

tests/test_chebyMap.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import unittest
 
 import numpy as np
@@ -298,8 +297,10 @@ def test_ChebyMapPolyTran(self):
         ])
 
         # Coefficients for the following gently varying polynomial:
-        # y1 = -2.0 T0(x1') T0(x2') + 0.11 T1(x1') T0(x2') - 0.2 T0(x1') T1(x2') + 0.001 T2(x1') T1(x2')
-        # y2 =  5.1 T0(x1') T0(x2') - 0.55 T1(x1') T0(x2') + 0.13 T0(x1') T1(x2') - 0.002 T1(x1') T2(x2')
+        # y1 = -2.0 T0(x1') T0(x2') + 0.11 T1(x1') T0(x2')
+        #      - 0.2 T0(x1') T1(x2') + 0.001 T2(x1') T1(x2')
+        # y2 =  5.1 T0(x1') T0(x2') - 0.55 T1(x1') T0(x2')
+        #       + 0.13 T0(x1') T1(x2') - 0.002 T1(x1') T2(x2')
         coeff_f = np.array([
             [-2.0, 1, 0, 0],
             [0.11, 1, 1, 0],
@@ -353,8 +354,8 @@ def referenceFunc(point):
         roundTripIn2 = chebyMap2.applyInverse(outdata)
         npt.assert_allclose(roundTripIn2, indata, atol=0.0002)
 
-        # fit an inverse transform with default bounds (which are the same bounds
-        # used for fitting chebyMap2, so the results should be the same)
+        # fit an inverse transform with default bounds (which are the same
+        # bounds used for fitting chebyMap2, so the results should be the same)
         chebyMap3 = chebyMap1.polyTran(forward=False, acc=0.0001, maxacc=0.001, maxorder=6)
         self.assertTrue(chebyMap2.hasForward)
         self.assertTrue(chebyMap2.hasInverse)

tests/test_cmpFrame.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import unittest
 
 import astshim as ast

tests/test_cmpMap.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import unittest
 
 import numpy as np
@@ -111,7 +110,8 @@ def test_ParallelMap(self):
         self.checkMappingPersistence(parmap3, indata)
 
     def test_SeriesMapMatrixShiftSimplify(self):
-        """Test that a non-square matrix map followed by a shift map can be simplified
+        """Test that a non-square matrix map followed by a shift map can be
+        simplified.
 
         This is ticket DM-10946
         """

tests/test_fitsChan.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import os.path
 import unittest
 import numpy as np
@@ -52,7 +51,8 @@ def setUp(self):
         self.cards = [pad(card) for card in shortCards]
 
     def insertPixelMapping(self, mapping, frameSet):
-        """Make a new WCS by inserting a new mapping at the beginnning of the GRID-IWC mapping
+        """Make a new WCS by inserting a new mapping at the beginnning of the
+        GRID-IWC mapping
 
         Return the new FrameSet (the original is not altered).
         """
@@ -74,7 +74,8 @@ def insertPixelMapping(self, mapping, frameSet):
         oldGridToIwc = frameSet.getMapping(gridIndex, oldIwcIndex)
         iwcToSky = frameSet.getMapping(oldIwcIndex, oldSkyIndex)
 
-        # Remove frames in order high to low, so removal doesn't alter the indices remaining to be removed;
+        # Remove frames in order high to low, so removal doesn't alter the
+        # indices remaining to be removed;
         # update gridIndex during removal so it still points to the GRID frame
         framesToRemove = reversed(sorted([oldIwcIndex, oldSkyIndex]))
         for index in framesToRemove:
@@ -153,9 +154,10 @@ def test_FitsChanPreloaded(self):
                          [card.split(" ", 1)[0] for card in self.cards])
 
     def test_FitsChanFileStream(self):
-        """Test a FitsChan with a FileStream
+        """Test a FitsChan with a FileStream/
 
-        In particular, make sure that cards are written as the channel is destroyed
+        In particular, make sure that cards are written as the channel is
+        destroyed.
         """
         path = os.path.join(self.dataDir, "test_fitsChanFileStream.fits")
         fc1 = ast.FitsChan(ast.FileStream(path, True))
@@ -337,8 +339,8 @@ def test_FitsChanGetCurrentForNonexistentCard(self):
         fc.setFitsI("ANINT", 200)
         fc.setFitsS("ASTRING", "string value")
         fc.setCard(fc.nCard + 1)
-        self.assertEqual(fc.getCardType(), ast.NOTYPE)
-        self.assertEqual(fc.testFits(), ast.ABSENT)
+        self.assertEqual(fc.getCardType(), ast.CardType.NOTYPE)
+        self.assertEqual(fc.testFits(), ast.FitsKeyState.ABSENT)
         with self.assertRaises(RuntimeError):
             fc.getFitsCN()
         with self.assertRaises(RuntimeError):
@@ -355,7 +357,8 @@ def test_FitsChanGetCurrentForNonexistentCard(self):
         self.assertEqual(fc.getCardComm(), "")
 
     def test_FitsChanGetFitsMissing(self):
-        """Test FitsChan.getFits<X> for missing cards, with and without defaults
+        """Test FitsChan.getFits<X> for missing cards, with and without
+        defaults
         """
         fc = ast.FitsChan(ast.StringStream())
         fc.setFitsI("ANINT", 200)
@@ -617,17 +620,17 @@ def test_FitsChanTestFits(self):
         fc.setFitsS("ASTRING", "a string")
         fc.setFitsU("UNDEFVAL")
 
-        self.assertEqual(fc.testFits("AFLOAT"), ast.PRESENT)
-        self.assertEqual(fc.testFits("ASTRING"), ast.PRESENT)
-        self.assertEqual(fc.testFits("UNDEFVAL"), ast.NOVALUE)
-        self.assertEqual(fc.testFits("BADNAME"), ast.ABSENT)
+        self.assertEqual(fc.testFits("AFLOAT"), ast.FitsKeyState.PRESENT)
+        self.assertEqual(fc.testFits("ASTRING"), ast.FitsKeyState.PRESENT)
+        self.assertEqual(fc.testFits("UNDEFVAL"), ast.FitsKeyState.NOVALUE)
+        self.assertEqual(fc.testFits("BADNAME"), ast.FitsKeyState.ABSENT)
 
         fc.setCard(1)
         self.assertEqual(fc.getCardName(), "AFLOAT")
-        self.assertEqual(fc.testFits(), ast.PRESENT)
+        self.assertEqual(fc.testFits(), ast.FitsKeyState.PRESENT)
         fc.setCard(3)
         self.assertEqual(fc.getCardName(), "UNDEFVAL")
-        self.assertEqual(fc.testFits(), ast.NOVALUE)
+        self.assertEqual(fc.testFits(), ast.FitsKeyState.NOVALUE)
 
     def test_FitsChanInsertShift(self):
         """Check that a simple WCS can still be written as FITS-WCS
@@ -657,10 +660,11 @@ def test_FitsChanInsertShift(self):
             fv = fc3.getFitsF("CRPIX%d" % (i,))
             self.assertAlmostEqual(fv.value, 100 - shift)
         for name in fc2.getAllCardNames():
-            self.assertEqual(fc3.testFits(name), ast.PRESENT)
+            self.assertEqual(fc3.testFits(name), ast.FitsKeyState.PRESENT)
 
     def test_FitsChanFitsTol(self):
-        """Test that increasing FitsTol allows writing a WCS with distortion as FITS-WCS
+        """Test that increasing FitsTol allows writing a WCS with distortion
+        as FITS-WCS.
         """
         ss = ast.StringStream("".join(self.cards))
         fc = ast.FitsChan(ss, "Encoding=FITS-WCS, IWC=1")

tests/test_frame.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import math
 import unittest
 

tests/test_frameDict.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import unittest
 
 import numpy as np

tests/test_frameSet.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import unittest
 
 import numpy as np
@@ -135,7 +134,8 @@ def test_FrameSetRemoveFrame(self):
         # remove the frame named "base", leaving the frame named "current"
         frameSet.removeFrame(1)
         self.assertEqual(frameSet.nFrame, 1)
-        # removing one frame leaves frame, newFrame and a copy of newFrame in FrameSet
+        # Removing one frame leaves frame, newFrame and a copy of newFrame in
+        # FrameSet.
         self.assertEqual(frame.getNObject(), initialNumFrames + 2)
         self.assertEqual(zoomMap.getNObject(), initialNumZoomMap)
         frameDeep = frameSet.getFrame(1)

tests/test_functions.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import unittest
 
 import astshim as ast

tests/test_keyMap.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import unittest
 
 from numpy.testing import assert_allclose

tests/test_lutMap.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function
 import sys
 import unittest