uncomment some tests

nanograv · Oct 17, 2024 · dba9c0e · dba9c0e
1 parent d83a97b
commit dba9c0e
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 50 deletions.
diff --git a/tests/enterprise_test_data.py b/tests/enterprise_test_data.py
@@ -14,15 +14,15 @@
 
 # Is libstempo installed?
 try:
-    import libstempo
+    import libstempo  # noqa
 
     LIBSTEMPO_INSTALLED = True
 except ImportError:
     LIBSTEMPO_INSTALLED = False
 
 # Is PINT installed?
 try:
-    import pint
+    import pint # noqa
 
     PINT_INSTALLED = True
 except ImportError:

diff --git a/tests/test_parameter.py b/tests/test_parameter.py
@@ -76,7 +76,7 @@ def test_uniform(self):
         msg2 = "Enterprise samples have wrong value, type, or size"
         x1 = UniformSampler(p_min, p_max)
         assert p_min < x1 < p_max, msg2
-        assert type(x1) == float, msg2
+        assert type(x1) is float, msg2
 
         msg3 = "Enterprise and scipy PPF do not match"
         assert np.allclose(UniformPPF(x, p_min, p_max), scipy.stats.uniform.ppf(x, p_min, p_max - p_min)), msg3

diff --git a/tests/test_white_signals.py b/tests/test_white_signals.py
@@ -506,50 +506,50 @@ def test_ecorr_block_ipta(self):
         self._ecorr_test_ipta(method="block", shuffled=True)
 
 
-# @pytest.mark.skipif(not PINT_INSTALLED, reason="Skipping tests that require PINT because it isn't installed")
-# class TestWhiteSignalsPint(TestWhiteSignals):
-#     @classmethod
-#     def setUpClass(cls):
-#         """Setup the Pulsar object."""
-
-#         # initialize Pulsar class
-#         cls.psr = Pulsar(
-#             datadir + "/B1855+09_NANOGrav_9yv1.gls.par",
-#             datadir + "/B1855+09_NANOGrav_9yv1.tim",
-#             ephem="DE430",
-#             timing_package="pint",
-#         )
-
-#         # IPTA-like pulsar
-#         cls.ipsr = Pulsar(
-#             datadir + "/1713.Sep.T2.par", datadir + "/1713.Sep.T2.tim", ephem="DE421", timint_package="pint", sort=True
-#         )
-
-#         # Same pulsar, but with TOAs shuffled
-#         cls.ipsr_shuffled = Pulsar(
-#             datadir + "/1713.Sep.T2.par", datadir + "/1713.Sep.T2.tim", ephem="DE421", timint_package="pint", sort=True
-#         )
-#         rng = np.random.default_rng(seed=123)
-#         rng.shuffle(cls.ipsr_shuffled._isort)
-#         for ii, p in enumerate(cls.ipsr_shuffled._isort):
-#             cls.ipsr_shuffled._iisort[p] = ii
-
-
-# @pytest.mark.skipif(not LIBSTEMPO_INSTALLED, reason="Skipping tests that require libstempo because it isn't installed")
-# class TestWhiteSignalsTempo2(TestWhiteSignals):
-#     @classmethod
-#     def setUpClass(cls):
-#         """Setup the Pulsar object."""
-
-#         # initialize Pulsar class
-#         cls.psr = Pulsar(datadir + "/B1855+09_NANOGrav_9yv1.gls.par", datadir + "/B1855+09_NANOGrav_9yv1.tim")
-
-#         # IPTA-like pulsar
-#         cls.ipsr = Pulsar(datadir + "/1713.Sep.T2.par", datadir + "/1713.Sep.T2.tim", sort=True)
-
-#         # Same pulsar, but with TOAs shuffled
-#         cls.ipsr_shuffled = Pulsar(datadir + "/1713.Sep.T2.par", datadir + "/1713.Sep.T2.tim", sort=True)
-#         rng = np.random.default_rng(seed=123)
-#         rng.shuffle(cls.ipsr_shuffled._isort)
-#         for ii, p in enumerate(cls.ipsr_shuffled._isort):
-#             cls.ipsr_shuffled._iisort[p] = ii
+@pytest.mark.skipif(not PINT_INSTALLED, reason="Skipping tests that require PINT because it isn't installed")
+class TestWhiteSignalsPint(TestWhiteSignals):
+    @classmethod
+    def setUpClass(cls):
+        """Setup the Pulsar object."""
+
+        # initialize Pulsar class
+        cls.psr = Pulsar(
+            datadir + "/B1855+09_NANOGrav_9yv1.gls.par",
+            datadir + "/B1855+09_NANOGrav_9yv1.tim",
+            ephem="DE430",
+            timing_package="pint",
+        )
+
+        # IPTA-like pulsar
+        cls.ipsr = Pulsar(
+            datadir + "/1713.Sep.T2.par", datadir + "/1713.Sep.T2.tim", ephem="DE421", timint_package="pint", sort=True
+        )
+
+        # Same pulsar, but with TOAs shuffled
+        cls.ipsr_shuffled = Pulsar(
+            datadir + "/1713.Sep.T2.par", datadir + "/1713.Sep.T2.tim", ephem="DE421", timint_package="pint", sort=True
+        )
+        rng = np.random.default_rng(seed=123)
+        rng.shuffle(cls.ipsr_shuffled._isort)
+        for ii, p in enumerate(cls.ipsr_shuffled._isort):
+            cls.ipsr_shuffled._iisort[p] = ii
+
+
+@pytest.mark.skipif(not LIBSTEMPO_INSTALLED, reason="Skipping tests that require libstempo because it isn't installed")
+class TestWhiteSignalsTempo2(TestWhiteSignals):
+    @classmethod
+    def setUpClass(cls):
+        """Setup the Pulsar object."""
+
+        # initialize Pulsar class
+        cls.psr = Pulsar(datadir + "/B1855+09_NANOGrav_9yv1.gls.par", datadir + "/B1855+09_NANOGrav_9yv1.tim")
+
+        # IPTA-like pulsar
+        cls.ipsr = Pulsar(datadir + "/1713.Sep.T2.par", datadir + "/1713.Sep.T2.tim", sort=True)
+
+        # Same pulsar, but with TOAs shuffled
+        cls.ipsr_shuffled = Pulsar(datadir + "/1713.Sep.T2.par", datadir + "/1713.Sep.T2.tim", sort=True)
+        rng = np.random.default_rng(seed=123)
+        rng.shuffle(cls.ipsr_shuffled._isort)
+        for ii, p in enumerate(cls.ipsr_shuffled._isort):
+            cls.ipsr_shuffled._iisort[p] = ii