DM-22234: Remove python 2 remnants

.travis.yml

@@ -0,0 +1,8 @@
+sudo: false
+language: python
+matrix:
+  include:
+    - python: '3.7'
+      install:
+      - pip install flake8
+      script: flake8

misc/makeHilbertLuts.py

@@ -13,7 +13,7 @@
 #      names of its contributors may be used to endorse or promote products
 #      derived from this software without specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" &
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 # DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY
@@ -28,10 +28,7 @@
 functions in `lsst/sphgeom/curve.h`.
 """
 
-from __future__ import absolute_import, division, print_function
-
 import math
-from builtins import range
 
 import numpy as np
 
@@ -145,13 +142,13 @@ def TR_algo2(p, M):
     for i in range(M-1, -1, -1):
         # the cell label is constructed in two steps
         # 1. extract the relevant bits from p
-        l = [bit_component(px, i) for px in p]
+        ll = [bit_component(px, i) for px in p]
         # 2. construct a integer whose bits are given by l
-        l = sum([lx*2**j for j, lx in enumerate(l)])
+        ll = sum([lx*2**j for j, lx in enumerate(ll)])
         # transform l into the current subcube
-        l = T(ve, vd, l)
+        ll = T(ve, vd, ll)
         # obtain the gray code ordering from the label l
-        w = inverse_gc(l)
+        w = inverse_gc(ll)
         # compose (see [TR] lemma 2.13) the transform of ve and vd
         # with the data of the subcube
         ve = ve ^ (rotate_left(e(w), vd+1))
@@ -169,10 +166,10 @@ def TR_algo3(h, M):
     for i in range(M-1, -1, -1):
         w = [bit_component(h, i*N + ii) for ii in range(N)]
         w = sum([wx*2**j for j, wx in enumerate(w)])
-        l = gc(w)
-        l = T_inv(ve, vd, l)
+        ll = gc(w)
+        ll = T_inv(ve, vd, ll)
         for j in range(N):
-            p[j] += bit_component(l, j) << i
+            p[j] += bit_component(ll, j) << i
         ve = ve ^ rotate_left(e(w), vd+1)
         vd = (vd + d(w) + 1) % N
     return p
@@ -201,13 +198,13 @@ def make_TR_algo2_lut(M):
                 for i in range(M-1, -1, -1):
                     # the cell label is constructed in two steps
                     # 1. extract the relevant bits from p
-                    l = [bit_component(px, i) for px in p]
+                    ll = [bit_component(px, i) for px in p]
                     # 2. construct a integer whose bits are given by l
-                    l = sum([lx*2**j for j, lx in enumerate(l)])
+                    ll = sum([lx*2**j for j, lx in enumerate(ll)])
                     # transform l into the current subcube
-                    l = T(ve, vd, l)
+                    ll = T(ve, vd, ll)
                     # obtain the gray code ordering from the label l
-                    w = inverse_gc(l)
+                    w = inverse_gc(ll)
                     # compose (see [TR] lemma 2.13) the transform of ve and vd
                     # with the data of the subcube
                     ve = ve ^ (rotate_left(e(w), vd+1))
@@ -232,11 +229,11 @@ def make_TR_algo3_lut(M):
                 for i in range(M-1, -1, -1):
                     w = [bit_component(h, i*N+ii) for ii in range(N)]
                     w = sum([wx*2**j for j, wx in enumerate(w)])
-                    l = gc(w)
-                    l = T_inv(ve, vd, l)
+                    ll = gc(w)
+                    ll = T_inv(ve, vd, ll)
                     ve = ve ^ rotate_left(e(w), vd+1)
                     vd = (vd + d(w) + 1) % N
-                    z = (z << N) | l
+                    z = (z << N) | ll
                 lut.append(z | (vd << 2*M) | ((ve % 2) << (2*M + 1)))
     return lut
 

python/lsst/sphgeom/__init__.py

@@ -22,7 +22,6 @@
 
 """lsst.sphgeom
 """
-from __future__ import absolute_import
 
 from .region import *
 from .pixelization import *

setup.cfg

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

tests/SConscript

@@ -1,2 +1,2 @@
 from lsst.sconsUtils import scripts
-scripts.BasicSConscript.tests()
+scripts.BasicSConscript.tests(pyList=[])

tests/test_Angle.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
 import pickle
 import unittest

tests/test_AngleIntervals.py

@@ -19,18 +19,16 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
 import pickle
 import unittest
-from builtins import object
 
 from lsst.sphgeom import (Angle, AngleInterval,
                           CONTAINS, DISJOINT,
                           NormalizedAngle, NormalizedAngleInterval)
 
 
-class IntervalTests(object):
+class IntervalTests:
 
     def testConstruction(self):
         i = self.Interval(self.Scalar(1))

tests/test_Box.py

@@ -19,12 +19,8 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
-try:
-    import cPickle as pickle   # Use cPickle on Python 2.7
-except ImportError:
-    import pickle
+import pickle
 
 import math
 import unittest

tests/test_Box3d.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
 import pickle
 import unittest

tests/test_Chunker.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
 import pickle
 import unittest

tests/test_Circle.py

@@ -19,12 +19,8 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
-try:
-    import cPickle as pickle   # Use cPickle on Python 2.7
-except ImportError:
-    import pickle
+import pickle
 
 import math
 import unittest

tests/test_ConvexPolygon.py

@@ -19,12 +19,8 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
-try:
-    import cPickle as pickle   # Use cPickle on Python 2.7
-except ImportError:
-    import pickle
+import pickle
 
 import unittest
 

tests/test_Ellipse.py

@@ -19,12 +19,8 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
-try:
-    import cPickle as pickle   # Use cPickle on Python 2.7
-except ImportError:
-    import pickle
+import pickle
 
 import math
 import unittest

tests/test_HtmPixelization.py

@@ -19,11 +19,9 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
 import pickle
 import unittest
-from builtins import range
 
 from lsst.sphgeom import Angle, Circle, HtmPixelization, RangeSet, UnitVector3d, ConvexPolygon
 

tests/test_Interval1d.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
 import pickle
 import unittest

tests/test_LonLat.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
 import pickle
 import unittest

tests/test_Matrix3d.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
 import pickle
 import unittest

tests/test_Mq3cPixelization.py

@@ -19,11 +19,9 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
 import pickle
 import unittest
-from builtins import range
 
 from lsst.sphgeom import (Angle, Circle, Mq3cPixelization, RangeSet,
                           UnitVector3d)

tests/test_NormalizedAngle.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
 import pickle
 import unittest

tests/test_Q3cPixelization.py

@@ -19,11 +19,9 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
 import pickle
 import unittest
-from builtins import range
 
 from lsst.sphgeom import Angle, Circle, Q3cPixelization, RangeSet, UnitVector3d
 

tests/test_RangeSet.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
 import pickle
 import sys

tests/test_UnitVector3d.py

@@ -19,12 +19,8 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
-try:
-    import cPickle as pickle   # Use cPickle on Python 2.7
-except ImportError:
-    import pickle
+import pickle
 
 import math
 import unittest

tests/test_Vector3d.py

@@ -19,7 +19,6 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from __future__ import absolute_import, division, print_function
 
 import math
 import pickle