Update floatCSEP interface to pyCSEP v0.8.0 (#123)

* ft: updated interfaces to pycsep v0.8.0: modified plot function names from all tutorials, modified pycsep function parsers, and fixed imports.

* ci: updated workflows and removed py=3.9 support
fix: changed tutorial g env to conda.

* fix: case g is now tested only locally

Author: pabloitu

.github/workflows/build-test.yml

@@ -15,8 +15,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-latest
-            python-version: '3.9'
           - os: ubuntu-latest
             python-version: '3.10'
           - os: ubuntu-latest

.github/workflows/publish-pypi.yml

@@ -21,7 +21,7 @@ jobs:
           generate-run-shell: true
           environment-file: environment.yml
           create-args: >-
-            python=3.10
+            python=3.11
 
       - name: Install py-build and setuptools-scm
         run: |

docs/intro/installation.rst

@@ -3,7 +3,7 @@ Installation
 
 .. important::
 
-    This application uses ``3.9 <= python <= 3.12``
+    This application uses ``3.10 <= python <= 3.12``
 
 
 Latest Version
@@ -128,7 +128,7 @@ Having a ``conda`` manager installed (see ``conda`` managers in :ref:`conda-inst
         $ conda activate experiment
         $ conda install -c conda-forge floatcsep
 
-where ``3.9 < {PYTHON_VERSION} <= 3.12`` is at your convenience.
+where ``3.10 < {PYTHON_VERSION} <= 3.12`` is at your convenience.
 
 2. From the ``PyPI`` repository
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

floatcsep/evaluation.py

@@ -47,23 +47,17 @@ class Evaluation:
         "sequential_information_gain": "sequential_comparative",
     }
 
-    "plot_sequential_likelihood"
-    "plot_matrix_comparative_test"
 
     _PLOTS = {
-        "csep.utils.plots.plot_consistency_test": "aggregate",
-        "csep.utils.plots.plot_poisson_consistency_test": "aggregate",
-        "csep.utils.plots.plot_comparison_test": "aggregate",
+        "csep.plots.plot_consistency_test": "aggregate",
+        "csep.plots.plot_comparison_test": "aggregate",
+        "csep.plots.plot_magnitude_test": "per_model",
+        "csep.plots.plot_test_distribution": "per_model",
+        "csep.plots.plot_calibration_test": "per_model",
+        "csep.plots.plot_concentration_ROC_diagram": "per_model",
+        "csep.plots.plot_ROC_diagram": "per_model",
+        "csep.plots.plot_Molchan_diagram": "per_model",
         "floatcsep.utils.helpers.plot_matrix_comparative_test": "aggregate",
-        "csep.utils.plots.plot_number_test": "per_model",
-        "csep.utils.plots.plot_magnitude_test": "per_model",
-        "csep.utils.plots.plot_distribution_test": "per_model",
-        "csep.utils.plots.plot_likelihood_test": "per_model",
-        "csep.utils.plots.plot_spatial_test": "per_model",
-        "csep.utils.plots.plot_calibration_test": "per_model",
-        "csep.utils.plots.plot_concentration_ROC_diagram": "per_model",
-        "csep.utils.plots.plot_ROC_diagram": "per_model",
-        "csep.utils.plots.plot_Molchan_diagram": "per_model",
         "floatcsep.utils.helpers.plot_sequential_likelihood": "sequential",
     }
 

floatcsep/utils/helpers.py

@@ -74,7 +74,7 @@ def _getattr(obj_, attr_):
         _target_modules = [
             csep,
             csep.utils,
-            csep.utils.plots,
+            csep.plots,
             csep.core.regions,
             floatcsep.utils.helpers,
             floatcsep.utils.accessors,

tests/e2e/test_data.py

@@ -88,6 +88,7 @@ def test_case_f(self, *args):
         self.run_evaluation(cfg)
         self.assertEqual(1, 1)
 
+    @skip_on_ci("Tested only locally")
     def test_case_g(self, *args):
         cfg = self.get_runpath("g")
         self.run_evaluation(cfg)
@@ -145,6 +146,7 @@ def test_case_f(self, *args):
         self.view_dashboard(cfg)
         self.assertEqual(1, 1)
 
+    @skip_on_ci("Tested only locally")
     def test_case_g(self, *args):
         cfg = self.get_rerunpath("g")
         self.view_dashboard(cfg)

tests/unit/test_utils.py

@@ -4,7 +4,7 @@
 from datetime import datetime
 
 import csep
-import csep.utils.plots
+import csep.plots
 import csep.core.regions
 
 import floatcsep
@@ -31,8 +31,8 @@ def test_parse_csep_func(self):
             parse_csep_func("join_struct_arrays"), csep.utils.join_struct_arrays.__class__
         )
         self.assertIsInstance(
-            parse_csep_func("plot_poisson_consistency_test"),
-            csep.utils.plots.plot_poisson_consistency_test.__class__,
+            parse_csep_func("plot_consistency_test"),
+            csep.plots.plot_consistency_test.__class__,
         )
         self.assertIsInstance(
             parse_csep_func("italy_csep_region"), csep.core.regions.italy_csep_region.__class__

tutorials/case_a/config.yml

@@ -20,7 +20,7 @@ models:
 tests:
   - Poisson N-test:
       func: poisson_evaluations.number_test
-      plot_func: plot_poisson_consistency_test
+      plot_func: plot_consistency_test
 
 postprocess:
   plot_forecasts:

tutorials/case_b/tests.yml

@@ -1,19 +1,19 @@
 - N-test:
     func: poisson_evaluations.number_test
-    plot_func: plot_poisson_consistency_test
+    plot_func: plot_consistency_test
 - S-test:
     func: poisson_evaluations.spatial_test
-    plot_func: plot_poisson_consistency_test
+    plot_func: plot_consistency_test
     plot_kwargs:
       one_sided_lower: True
 - M-test:
     func: poisson_evaluations.magnitude_test
-    plot_func: plot_poisson_consistency_test
+    plot_func: plot_consistency_test
     plot_kwargs:
       one_sided_lower: True
 - CL-test:
     func: poisson_evaluations.conditional_likelihood_test
-    plot_func: plot_poisson_consistency_test
+    plot_func: plot_consistency_test
     plot_kwargs:
       one_sided_lower: True
 - T-test:

tutorials/case_c/tests.yml

@@ -1,6 +1,6 @@
 - S-test:
     func: poisson_evaluations.spatial_test
-    plot_func: plot_poisson_consistency_test
+    plot_func: plot_consistency_test
     plot_args:
       title: Poisson S-test
       xlabel: Log-Likelihood