Fix PT004 violations

Author: seisman

pygmt/tests/test_clib.py

@@ -170,7 +170,9 @@ def test_call_module_error_message():
         with pytest.raises(GMTCLibError) as exc_info:
             lib.call_module("info", "bogus-data.bla")
         assert "Module 'info' failed with status code" in exc_info.value.args[0]
-        assert "gmtinfo [ERROR]: Cannot find file bogus-data.bla" in exc_info.value.args[0]
+        assert (
+            "gmtinfo [ERROR]: Cannot find file bogus-data.bla" in exc_info.value.args[0]
+        )
 
 
 def test_method_no_session():

pygmt/tests/test_clib_loading.py

@@ -131,13 +131,14 @@ def _mock_ctypes_cdll_return(self, libname):
         return self.loaded_libgmt
 
     @pytest.fixture()
-    def mock_ctypes(self, monkeypatch):
+    def _mock_ctypes(self, monkeypatch):
         """
         Patch the ctypes.CDLL function.
         """
         monkeypatch.setattr(ctypes, "CDLL", self._mock_ctypes_cdll_return)
 
-    def test_two_broken_libraries(self, mock_ctypes):
+    @pytest.mark.usefixtures("_mock_ctypes")
+    def test_two_broken_libraries(self):
         """
         Case 1: two broken libraries.
 
@@ -154,7 +155,8 @@ def test_two_broken_libraries(self, mock_ctypes):
         with pytest.raises(GMTCLibNotFoundError, match=msg_regex):
             load_libgmt(lib_fullnames=lib_fullnames)
 
-    def test_load_brokenlib_invalidpath(self, mock_ctypes):
+    @pytest.mark.usefixtures("_mock_ctypes")
+    def test_load_brokenlib_invalidpath(self):
         """
         Case 2: broken library + invalid path.
 
@@ -171,28 +173,32 @@ def test_load_brokenlib_invalidpath(self, mock_ctypes):
         with pytest.raises(GMTCLibNotFoundError, match=msg_regex):
             load_libgmt(lib_fullnames=lib_fullnames)
 
-    def test_brokenlib_invalidpath_workinglib(self, mock_ctypes):
+    @pytest.mark.usefixtures("_mock_ctypes")
+    def test_brokenlib_invalidpath_workinglib(self):
         """
         Case 3: broken library + invalid path + working library.
         """
         lib_fullnames = [self.faked_libgmt1, self.invalid_path, self.loaded_libgmt]
         assert check_libgmt(load_libgmt(lib_fullnames=lib_fullnames)) is None
 
-    def test_invalidpath_brokenlib_workinglib(self, mock_ctypes):
+    @pytest.mark.usefixtures("_mock_ctypes")
+    def test_invalidpath_brokenlib_workinglib(self):
         """
         Case 4: invalid path + broken library + working library.
         """
         lib_fullnames = [self.invalid_path, self.faked_libgmt1, self.loaded_libgmt]
         assert check_libgmt(load_libgmt(lib_fullnames=lib_fullnames)) is None
 
-    def test_workinglib_brokenlib_invalidpath(self, mock_ctypes):
+    @pytest.mark.usefixtures("_mock_ctypes")
+    def test_workinglib_brokenlib_invalidpath(self):
         """
         Case 5: working library + broken library + invalid path.
         """
         lib_fullnames = [self.loaded_libgmt, self.faked_libgmt1, self.invalid_path]
         assert check_libgmt(load_libgmt(lib_fullnames=lib_fullnames)) is None
 
-    def test_brokenlib_brokenlib_workinglib(self, mock_ctypes):
+    @pytest.mark.usefixtures("_mock_ctypes")
+    def test_brokenlib_brokenlib_workinglib(self):
         """
         Case 6: repeating broken libraries + working library.
         """

pygmt/tests/test_x2sys_cross.py

@@ -16,7 +16,7 @@
 
 
 @pytest.fixture(name="mock_x2sys_home")
-def fixture_mock_x2sys_home(monkeypatch):
+def _fixture_mock_x2sys_home(monkeypatch):
     """
     Set the X2SYS_HOME environment variable to the current working directory
     for the test session.
@@ -34,7 +34,8 @@ def fixture_tracks():
     return [dataframe.query(expr="z > -20")]  # reduce size of dataset
 
 
-def test_x2sys_cross_input_file_output_file(mock_x2sys_home):
+@pytest.mark.usefixture("mock_x2sys_home")
+def test_x2sys_cross_input_file_output_file():
     """
     Run x2sys_cross by passing in a filename, and output internal crossovers to
     an ASCII txt file.
@@ -52,7 +53,8 @@ def test_x2sys_cross_input_file_output_file(mock_x2sys_home):
         _ = pd.read_csv(outfile, sep="\t", header=2)  # ensure ASCII text file loads ok
 
 
-def test_x2sys_cross_input_file_output_dataframe(mock_x2sys_home):
+@pytest.mark.usefixture("mock_x2sys_home")
+def test_x2sys_cross_input_file_output_dataframe():
     """
     Run x2sys_cross by passing in a filename, and output internal crossovers to
     a pandas.DataFrame.
@@ -69,7 +71,8 @@ def test_x2sys_cross_input_file_output_dataframe(mock_x2sys_home):
         assert columns[6:] == ["head_1", "head_2", "vel_1", "vel_2", "z_X", "z_M"]
 
 
-def test_x2sys_cross_input_dataframe_output_dataframe(mock_x2sys_home, tracks):
+@pytest.mark.usefixture("mock_x2sys_home")
+def test_x2sys_cross_input_dataframe_output_dataframe(tracks):
     """
     Run x2sys_cross by passing in one dataframe, and output internal crossovers
     to a pandas.DataFrame.
@@ -89,7 +92,8 @@ def test_x2sys_cross_input_dataframe_output_dataframe(mock_x2sys_home, tracks):
         assert output.dtypes["i_2"].type == np.object_
 
 
-def test_x2sys_cross_input_two_dataframes(mock_x2sys_home):
+@pytest.mark.usefixture("mock_x2sys_home")
+def test_x2sys_cross_input_two_dataframes():
     """
     Run x2sys_cross by passing in two pandas.DataFrame tables with a time
     column, and output external crossovers to a pandas.DataFrame.
@@ -125,7 +129,8 @@ def test_x2sys_cross_input_two_dataframes(mock_x2sys_home):
         assert output.dtypes["t_2"].type == np.datetime64
 
 
-def test_x2sys_cross_input_dataframe_with_nan(mock_x2sys_home, tracks):
+@pytest.mark.usefixture("mock_x2sys_home")
+def test_x2sys_cross_input_dataframe_with_nan(tracks):
     """
     Run x2sys_cross by passing in one dataframe with NaN values, and output
     internal crossovers to a pandas.DataFrame.
@@ -148,7 +153,8 @@ def test_x2sys_cross_input_dataframe_with_nan(mock_x2sys_home, tracks):
         assert output.dtypes["i_2"].type == np.object_
 
 
-def test_x2sys_cross_input_two_filenames(mock_x2sys_home):
+@pytest.mark.usefixture("mock_x2sys_home")
+def test_x2sys_cross_input_two_filenames():
     """
     Run x2sys_cross by passing in two filenames, and output external crossovers
     to a pandas.DataFrame.
@@ -186,7 +192,8 @@ def test_x2sys_cross_invalid_tracks_input_type(tracks):
         x2sys_cross(tracks=[invalid_tracks])
 
 
-def test_x2sys_cross_region_interpolation_numpoints(mock_x2sys_home):
+@pytest.mark.usefixture("mock_x2sys_home")
+def test_x2sys_cross_region_interpolation_numpoints():
     """
     Test that x2sys_cross's region (R), interpolation (l) and numpoints (W)
     arguments work.
@@ -210,7 +217,8 @@ def test_x2sys_cross_region_interpolation_numpoints(mock_x2sys_home):
         npt.assert_allclose(output.z_M.mean(), -2890.465813)
 
 
-def test_x2sys_cross_trackvalues(mock_x2sys_home):
+@pytest.mark.usefixture("mock_x2sys_home")
+def test_x2sys_cross_trackvalues():
     """
     Test that x2sys_cross's trackvalues (Z) argument work.
     """

pygmt/tests/test_x2sys_init.py

@@ -9,15 +9,16 @@
 
 
 @pytest.fixture(name="mock_x2sys_home")
-def fixture_mock_x2sys_home(monkeypatch):
+def _fixture_mock_x2sys_home(monkeypatch):
     """
     Set the X2SYS_HOME environment variable to the current working directory
     for the test session.
     """
     monkeypatch.setenv("X2SYS_HOME", os.getcwd())
 
 
-def test_x2sys_init_region_spacing(mock_x2sys_home):
+@pytest.mark.usefixture("mock_x2sys_home")
+def test_x2sys_init_region_spacing():
     """
     Test that x2sys_init's region (R) and spacing (I) sequence arguments accept
     a list properly.
@@ -34,7 +35,8 @@ def test_x2sys_init_region_spacing(mock_x2sys_home):
             assert "-I5/5" in tail_line
 
 
-def test_x2sys_init_units_gap(mock_x2sys_home):
+@pytest.mark.usefixture("mock_x2sys_home")
+def test_x2sys_init_units_gap():
     """
     Test that x2sys_init's units (N) and gap (W) arguments accept a list
     properly.