Merge branch 'develop' into 354-create-a-phenology-golden-dataset

ImperialCollegeLondon · Dec 4, 2024 · 318dbf7 · 318dbf7
2 parents 50cb5e0 + d085e29
commit 318dbf7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ repos:
       - id: debug-statements
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.7.2
+    rev: v0.8.1
     hooks:
       # Run the linter.
       - id: ruff
@@ -21,7 +21,7 @@ repos:
         exclude: "pyrealm_build_data/splash/splash_py_version/.*\\.py"
         # https://stackoverflow.com/a/75447331/3401916
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.42.0
+    rev: v0.43.0
     hooks:
     - id: markdownlint
   - repo: https://github.com/mwouts/jupytext

diff --git a/pyrealm/constants/__init__.py b/pyrealm/constants/__init__.py
@@ -17,8 +17,8 @@
 from pyrealm.constants.tmodel_const import TModelTraits
 
 __all__ = [
-    "ConstantsClass",
     "C3C4Const",
+    "ConstantsClass",
     "CoreConst",
     "IsotopesConst",
     "PModelConst",

diff --git a/pyrealm/pmodel/__init__.py b/pyrealm/pmodel/__init__.py
@@ -57,6 +57,12 @@
 
 __all__ = [
     "C3C4Competition",
+    "CalcCarbonIsotopes",
+    "JmaxLimitation",
+    "PModel",
+    "PModelEnvironment",
+    "SubdailyPModel",
+    "SubdailyScaler",
     "calc_co2_to_ca",
     "calc_ftemp_arrh",
     "calc_ftemp_inst_rd",
@@ -68,14 +74,8 @@
     "calc_soilmstress_mengoli",
     "calc_soilmstress_stocker",
     "calc_viscosity_h2o",
-    "CalcCarbonIsotopes",
     "calculate_tree_proportion",
     "convert_gpp_advantage_to_c4_fraction",
     "convert_pmodel_to_subdaily",
-    "JmaxLimitation",
     "memory_effect",
-    "PModel",
-    "PModelEnvironment",
-    "SubdailyPModel",
-    "SubdailyScaler",
 ]