DM-11514: Support new pytest

.gitignore

@@ -7,6 +7,7 @@ config.log
 *.so
 *.cfgc
 *.pyc
+.cache
 lib/libbase.*
 python/lsst/base/version.py
 python/lsst64defs.py

python/lsst/base/packages.py

@@ -30,8 +30,6 @@
     old.update(pkgs)  # Include any new packages in the old
     old.write("/path/to/packages.pickle")
 """
-from future import standard_library
-standard_library.install_aliases()
 from builtins import object
 
 import os
@@ -44,6 +42,9 @@
 
 from .versions import getRuntimeVersions
 
+from future import standard_library
+standard_library.install_aliases()
+
 __all__ = ["getVersionFromPythonModule", "getPythonPackages", "getEnvironmentPackages", "Packages"]
 
 
@@ -127,6 +128,8 @@ def getPythonPackages():
 
 
 _eups = None  # Singleton Eups object
+
+
 def getEnvironmentPackages():
     """Provide a dict of products and their versions from the environment
 

python/lsstDebug.py

@@ -21,6 +21,7 @@
 # see <http://www.lsstcorp.org/LegalNotices/>.
 #
 
+
 #
 # Define a class to configure debugging information
 #
@@ -61,8 +62,10 @@ def __setattr__(self, what, value):
         """Set the value of the variable "what" in self.__modname to value"""
         self._dict[what] = value
 
+
 getInfo = Info
 
+
 def getDebugFrame(debugDisplay, name):
     """
     Attempt to extract a frame for displaying a product called `name` from the `debugDisplay` variable.

python/lsstcppimport.py

@@ -1 +1 @@
-from _lsstcppimport import *
+from _lsstcppimport import *  # noqa F403 F401

python/lsstimport.py

@@ -94,7 +94,7 @@ def imp_load_module(name, *args):
         lsstIdx = [i for i, el in enumerate(pathParts) if el == 'python']
         if pathParts[-1] in LIB_EXCEPTION_LIST or (extension in SHARED_LIB_EXTENSION_LIST and
                                                    pathParts[-1].startswith('_') and
-                                                   'lsst' in [pathParts[i+1] for i in lsstIdx]):
+                                                   'lsst' in [pathParts[i + 1] for i in lsstIdx]):
             # Get currently set flags
             originalDLFlags = sys.getdlopenflags()
             # Set flags
@@ -110,12 +110,12 @@ def imp_load_module(name, *args):
     imp.load_module = imp_load_module
 
 try:
-    import lsstcppimport
+    import lsstcppimport  # noqa F401
 except ImportError:
     # The lsstcppimport may have failed because we're inside Scons.
     # If we are, then don't worry about it
     try:
-        import SCons.Script
+        import SCons.Script  # noqa F401
     # If we're not, then
     #   a) we will get an ImportError trying to import SCons.Script
     #   b) and will know that the first ImportError really is a problem

setup.cfg

@@ -0,0 +1,7 @@
+[flake8]
+max-line-length = 110
+ignore = E133, E226, E228, N802, N803
+exclude = __init__.py
+
+[tool:pytest]
+addopts = --flake8

tests/SConscript

@@ -2,4 +2,5 @@
 from lsst.sconsUtils import scripts
 
 scripts.BasicSConscript.pybind11(['testModuleImporterLib'])
-scripts.BasicSConscript.tests(noBuildList=['testModuleImporterLib.cc'])
+scripts.BasicSConscript.tests(noBuildList=['testModuleImporterLib.cc'],
+                              pySingles=['testModuleImporter2.py'], pyList=[])

tests/testModuleImporter2.py

@@ -31,8 +31,9 @@ def testImporter(self):
         # Before we import lsst, the functionality to import Python modules from C++ should not work.
         self.assertFalse(testModuleImporterLib.doImport("math"))
         # ...but after we import lsst (and lsstimport and lsstcppimport), it should.`
-        import lsst
+        import lsst  # noqa F401
         self.assertTrue(testModuleImporterLib.doImport("math"))
 
+
 if __name__ == "__main__":
     unittest.main()

tests/packages.py → tests/test_packages.py

@@ -20,15 +20,15 @@
 # the GNU General Public License along with this program.  If not,
 # see <https://www.lsstcorp.org/LegalNotices/>.
 #
-from future import standard_library
-standard_library.install_aliases()
-
 import os
 import unittest
 import tempfile
 
 import lsst.base
 
+from future import standard_library
+standard_library.install_aliases()
+
 
 class PackagesTestCase(unittest.TestCase):
     """Tests for package version collection
@@ -113,5 +113,6 @@ def testPackages(self):
         self.assertDictEqual(packages.extra(new), {})
         self.assertEqual(len(packages), len(new))
 
+
 if __name__ == "__main__":
     unittest.main()

tests/testThreads2.py → tests/test_threads.py

@@ -25,22 +25,24 @@
 
 from past.builtins import long
 
+
 class ThreadsTestCase(unittest.TestCase):
 
     def testApi(self):
         from lsst.base import haveThreads
         self.assertIsInstance(haveThreads(), bool)
 
-        from lsst.base import setNumThreads
+        from lsst.base import setNumThreads  # noqa F401
 # Raises lsst::base::NoThreadsException which is untranslated
 # when threading library is missing, this needs fixing!
 #        self.assertIs(setNumThreads(4), None)
 
-        from lsst.base import getNumThreads 
+        from lsst.base import getNumThreads
         self.assertIsInstance(getNumThreads(), (int, long))
 
         from lsst.base import disableImplicitThreading
         self.assertIsInstance(disableImplicitThreading(), bool)
 
+
 if __name__ == "__main__":
     unittest.main()