Merge pull request #95 from dwr-zroy/tests/clean-imports

Use `pytest.ini_options.pythonpath` instead of modifying `sys.path` in test modules

Author: oskarhurst

pyproject.toml

@@ -68,3 +68,4 @@ build-backend = "setuptools.build_meta"
 log_cli = true
 log_cli_level = 'INFO'
 testpaths = ["tests"]
+pythonpath = "./src"

tests/test_array.py

@@ -1,14 +1,11 @@
 """Pytest module."""
 
 import unittest
-import os
-import sys
-import numpy as np
 
-sys.path.append(r'src')
-sys.path.append(os.path.dirname(__file__))
+import numpy as np
 from file_manager import FileManager
-from hecdss import HecDss, ArrayContainer
+
+from hecdss import ArrayContainer, HecDss
 
 
 class TestArray(unittest.TestCase):

tests/test_basics.py

@@ -1,14 +1,11 @@
 """Pytest module."""
 
 import unittest
-import os
-import sys
+from datetime import datetime
 
-sys.path.append(r'src')
-sys.path.append(os.path.dirname(__file__))
 from file_manager import FileManager
+
 from hecdss import Catalog, HecDss
-from datetime import datetime
 
 
 class TestBasics(unittest.TestCase):

tests/test_dss_type.py

@@ -1,9 +1,5 @@
 import unittest
-import os
-import sys
 
-sys.path.append(r'src')
-sys.path.append(os.path.dirname(__file__))
 from hecdss.dss_type import DssType
 
 

tests/test_dsspath.py

@@ -1,15 +1,10 @@
 """Pytest module."""
 
 import unittest
-import os
-import sys
-
-sys.path.append(r'src')
-sys.path.append(os.path.dirname(__file__))
 
+from hecdss import DssPath
 from hecdss.cwms_utility import CwmsUtility
 from hecdss.dss_type import DssType
-from hecdss import DssPath
 
 
 class TestDssPath(unittest.TestCase):

tests/test_gridded_data.py

@@ -1,15 +1,12 @@
 """Pytest module."""
 
 import unittest
-import sys
-import os
-import numpy as np
 
-sys.path.append(r'src')
-sys.path.append(os.path.dirname(__file__))
+import numpy as np
 from file_manager import FileManager
-from hecdss.gridded_data import GriddedData
+
 from hecdss import HecDss
+from hecdss.gridded_data import GriddedData
 
 
 class TestGriddedData(unittest.TestCase):

tests/test_irregular_timeseries.py

@@ -1,18 +1,16 @@
 """Pytest module."""
 
-import unittest
-import sys
 import os
-import numpy as np
-
-
-sys.path.append(r'src')
-sys.path.append(os.path.dirname(__file__))
+import sys
+import unittest
+from datetime import datetime, timedelta
 
+import numpy as np
 from file_manager import FileManager
-from hecdss.irregular_timeseries import IrregularTimeSeries
-from datetime import datetime, timedelta
+
 from hecdss import HecDss
+from hecdss.irregular_timeseries import IrregularTimeSeries
+
 
 class TestRegularTimeSeries(unittest.TestCase):
 

tests/test_location_info.py

@@ -1,18 +1,11 @@
 """Pytest module."""
 
 import unittest
-import sys
-import os
-import numpy as np
-
-sys.path.append(r'src')
-sys.path.append(os.path.dirname(__file__))
 
 from file_manager import FileManager
-import copy
-from hecdss.paired_data import PairedData
-from hecdss.location_info import LocationInfo
+
 from hecdss import HecDss
+from hecdss.location_info import LocationInfo
 
 
 # update MODIFIED_TEST_DIR to be the path the folder containing dss files

tests/test_paired_data.py

@@ -1,17 +1,13 @@
 """Pytest module."""
 
+import copy
 import unittest
-import sys
-import os
-import numpy as np
-
-sys.path.append(r'src')
-sys.path.append(os.path.dirname(__file__))
 
+import numpy as np
 from file_manager import FileManager
-import copy
-from hecdss.paired_data import PairedData
+
 from hecdss import HecDss
+from hecdss.paired_data import PairedData
 
 
 # update MODIFIED_TEST_DIR to be the path the folder containing dss files

tests/test_regular_timeseries.py

@@ -1,19 +1,14 @@
 """Pytest module."""
 
 import unittest
-import sys
-import os
+from datetime import datetime, timedelta
 
 import numpy as np
+from file_manager import FileManager
 
 from hecdss import HecDss
-
-sys.path.append(r'src')
-sys.path.append(os.path.dirname(__file__))
-
-from file_manager import FileManager
 from hecdss.regular_timeseries import RegularTimeSeries
-from datetime import datetime, timedelta
+
 
 class TestRegularTimeSeries(unittest.TestCase):