Rename logging->custom_logging

needed because geopandas has a conflicting logging important apparently

swmmanywhere/logging.py → swmmanywhere/custom_logging.py

@@ -4,7 +4,7 @@
 >>> import os
 >>> os.environ["SWMMANYWHERE_VERBOSE"] = "true" 
 >>> # logging is now enabled in any swmmanywhere module
->>> from swmmanywhere.logging import logger # You can now log yourself
+>>> from swmmanywhere.custom_logging import logger # You can now log yourself
 >>> logger.info("This is an info message.") # Write to stdout # doctest: +SKIP
 This is an info message.
 >>> logger.add("file.log") # Add a log file # doctest: +SKIP

swmmanywhere/geospatial_utilities.py

@@ -36,7 +36,7 @@
 import pysheds  # noqa: E402
 from pysheds import grid as pgrid  # noqa: E402
 
-from swmmanywhere.logging import logger  # noqa: E402
+from swmmanywhere.custom_logging import logger  # noqa: E402
 
 TransformerFromCRS = lru_cache(pyproj.transformer.Transformer.from_crs)
 

swmmanywhere/graph_utilities.py

@@ -24,7 +24,7 @@
 
 from swmmanywhere import geospatial_utilities as go
 from swmmanywhere import parameters, shortest_path_utils
-from swmmanywhere.logging import logger
+from swmmanywhere.custom_logging import logger
 
 
 def load_graph(fid: Path) -> nx.Graph:

swmmanywhere/metric_utilities.py

@@ -19,7 +19,7 @@
 import shapely
 from scipy import stats
 
-from swmmanywhere.logging import logger
+from swmmanywhere.custom_logging import logger
 from swmmanywhere.parameters import MetricEvaluation
 
 

swmmanywhere/paper/experimenter.py

@@ -20,7 +20,7 @@
 os.environ['OMP_NUM_THREADS'] = '1'
 
 from swmmanywhere import swmmanywhere  # noqa: E402
-from swmmanywhere.logging import logger  # noqa: E402
+from swmmanywhere.custom_logging import logger  # noqa: E402
 from swmmanywhere.parameters import get_full_parameters_flat  # noqa: E402
 
 os.environ['SWMMANYWHERE_VERBOSE'] = "true"

swmmanywhere/paper/perform_sa.py

@@ -8,7 +8,7 @@
 from SALib.analyze import sobol
 from tqdm import tqdm
 
-from swmmanywhere.logging import logger
+from swmmanywhere.custom_logging import logger
 from swmmanywhere.paper import experimenter
 from swmmanywhere.paper import plotting as swplt
 from swmmanywhere.preprocessing import check_bboxes

swmmanywhere/prepare_data.py

@@ -17,7 +17,7 @@
 import yaml
 from geopy.geocoders import Nominatim
 
-from swmmanywhere.logging import logger
+from swmmanywhere.custom_logging import logger
 
 
 def get_country(x: float, 

swmmanywhere/preprocessing.py

@@ -18,7 +18,7 @@
 from swmmanywhere import geospatial_utilities as go
 from swmmanywhere import graph_utilities as gu
 from swmmanywhere import parameters, prepare_data
-from swmmanywhere.logging import logger
+from swmmanywhere.custom_logging import logger
 
 
 def next_directory(keyword: str, directory: Path) -> int:

tests/test_graph_utilities.py

@@ -15,9 +15,9 @@
 from shapely import geometry as sgeom
 
 from swmmanywhere import parameters
+from swmmanywhere.custom_logging import logger
 from swmmanywhere.graph_utilities import graphfcns as gu
 from swmmanywhere.graph_utilities import iterate_graphfcns, load_graph, save_graph
-from swmmanywhere.logging import logger
 
 
 def load_street_network():

tests/test_logging.py

@@ -9,7 +9,7 @@
 from pathlib import Path
 from tempfile import NamedTemporaryFile
 
-from swmmanywhere.logging import logger
+from swmmanywhere.custom_logging import logger
 
 
 def test_logger():
@@ -48,7 +48,7 @@ def test_logger_disable():
 
 def test_logger_reimport():
     """Reimport logger to check that changes from disable are persistent."""
-    from swmmanywhere.logging import logger
+    from swmmanywhere.custom_logging import logger
     with NamedTemporaryFile(suffix='.log',
                             mode = 'w+b',
                             delete=False) as temp_file: