Merge pull request #42 from lsst/tickets/DM-25345

DM-25345: Put __init__.py back into root of hierarchy
lsst · Jun 9, 2020 · 04f1aa2 · 04f1aa2
2 parents 2334185 + 8174ba4
commit 04f1aa2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/python/lsst/__init__.py b/python/lsst/__init__.py
@@ -0,0 +1,2 @@
+import pkgutil
+__path__ = pkgutil.extend_path(__path__, __name__)
diff --git a/tests/test_packages.py b/tests/test_packages.py
@@ -86,8 +86,10 @@ def testPackages(self):
         new_pkl = self._writeTempFile(packages, ".pkl")
         new_yaml = self._writeTempFile(packages, ".yaml")
 
-        self.assertIsInstance(new, lsst.base.Packages)
-        self.assertIsInstance(new_yaml, lsst.base.Packages)
+        self.assertIsInstance(new, lsst.base.Packages,
+                              f"Checking type ({type(new)}) from pickle")
+        self.assertIsInstance(new_yaml, lsst.base.Packages,
+                              f"Checking type ({type(new_yaml)}) from YAML")
         self.assertEqual(new, packages)
         self.assertEqual(new_pkl, new)
         self.assertEqual(new, new_yaml)