Merge branch 'main' into tutorials

# Conflicts:
#	pyproject.toml
#	requirements-dev.txt

pyproject.toml

@@ -36,7 +36,8 @@ dev = [
     "pytest-cov",
     "geopandas",
     "matplotlib",
-    "shapely"
+    "shapely",
+    "pytest-cov"
 ]
 
 demos = [
@@ -65,8 +66,5 @@ addopts = "-v -p no:warnings --cov=wsimod --cov-report=html"
 select = ["E", "F", "I"] # pycodestyle, Pyflakes, isort. Ignoring pydocstyle (D), for now
 exclude = ["docs", "tests"]  # Let's ignore tests and docs folders, for now
 
-[tool.ruff.per-file-ignores]
-"wsimod/*" = ["E501"]  # 176 lines (all comments) are too long (>88). Ignoring, for now
-
 [tool.ruff.pydocstyle]
 convention = "google"

requirements.txt

@@ -2,10 +2,8 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --output-file=requirements.txt
+#    pip-compile
 #
-colorama==0.4.6
-    # via tqdm
 dill==0.3.7
     # via wsimod (pyproject.toml)
 numpy==1.26.2

wsimod/core/constants.py

@@ -2,14 +2,14 @@
 """Created on Fri Dec  6 15:17:07 2019.
 
 @author: bdobson
-
 """
 from wsimod.core import constants
 
 M3_S_TO_ML_D = 86.4
 MM_KM2_TO_ML = 1e-3 * 1e6 * 1e3 * 1e-6  # mm->m, km2->m2, m3->l, l->Ml
 MM_M2_TO_ML = 1e-3 * 1e3 * 1e-6  # mm->m, m3->l, l->Ml
-MM_M2_TO_SIM_VOLUME = MM_M2_TO_ML  # SIM volume is by default ML, but can be changed by changing MM_TO_SIM_VOLUME
+MM_M2_TO_SIM_VOLUME = MM_M2_TO_ML  # SIM volume is by default ML, but can be changed by
+# changing MM_TO_SIM_VOLUME
 MM_M2_TO_M3 = 1e-3  # mm->m
 ML_TO_M3 = 1000
 PCT_TO_PROP = 1 / 100
@@ -117,7 +117,8 @@ def set_default_pollutants():
         "do",
         "temperature",
         "ph",
-    ]  # e.g. pollutants whose concentration should not increase if volume is distilled out
+    ]  # e.g. pollutants whose concentration should not increase if volume is distilled
+    # out
     constants.ADDITIVE_POLLUTANTS = [
         "org-phosphorus",
         "phosphate",