Skip to content

Update floatCSEP interface to pyCSEP v0.8.0 #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pabloitu merged 3 commits into from
Feb 3, 2026
Merged

Update floatCSEP interface to pyCSEP v0.8.0 #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3990389
ft: updated interfaces to pycsep v0.8.0: modified plot function names…
pabloitu Feb 3, 2026
5a8a6e9
ci: updated workflows and removed py=3.9 support
pabloitu Feb 3, 2026
f4497d4
fix: case g is now tested only locally
pabloitu Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-pypi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions docs/intro/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Installation

.. important::

This application uses ``3.9 <= python <= 3.12``
This application uses ``3.10 <= python <= 3.12``


Latest Version
Expand Down Expand Up @@ -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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
22 changes: 8 additions & 14 deletions floatcsep/evaluation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}

Expand Down
2 changes: 1 addition & 1 deletion floatcsep/utils/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from datetime import datetime

import csep
import csep.utils.plots
import csep.plots
import csep.core.regions

import floatcsep
Expand All @@ -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__
Expand Down
2 changes: 1 addition & 1 deletion tutorials/case_a/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions tutorials/case_b/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion tutorials/case_c/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tutorials/case_d/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- Poisson S:
func: poisson_evaluations.spatial_test
plot_func: plot_poisson_consistency_test
plot_func: plot_consistency_test
plot_args:
title: S-test
xlabel: Spatial Log-Likelihood
Expand Down
2 changes: 1 addition & 1 deletion tutorials/case_e/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- Poisson_S:
func: poisson_evaluations.spatial_test
plot_func: plot_poisson_consistency_test
plot_func: plot_consistency_test
plot_kwargs:
one_sided_lower: True
plot_args:
Expand Down
2 changes: 1 addition & 1 deletion tutorials/case_f/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- Catalog_N-test:
func: catalog_evaluations.number_test
plot_func:
- plot_number_test:
- plot_test_distribution:
plot_args:
title: Test distribution
- plot_consistency_test:
Expand Down
2 changes: 1 addition & 1 deletion tutorials/case_g/models.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
n_sims: 100
mag_min: 3.5
seed: 23
build: venv
build: conda
2 changes: 1 addition & 1 deletion tutorials/case_g/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- Catalog_N-test:
func: catalog_evaluations.number_test
plot_func:
- plot_number_test:
- plot_test_distribution:
plot_args:
title: Test distribution
- plot_consistency_test:
Expand Down
2 changes: 1 addition & 1 deletion tutorials/case_h/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
func_kwargs:
verbose: False
plot_func:
- plot_number_test:
- plot_test_distribution:
plot_args:
title: Number consistency test
bins: 30
Expand Down
2 changes: 1 addition & 1 deletion tutorials/case_i/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- Catalog_N-test:
func: catalog_evaluations.number_test
plot_func:
- plot_number_test:
- plot_test_distribution:
plot_args:
title: Test distribution
- plot_consistency_test:
Expand Down
2 changes: 1 addition & 1 deletion tutorials/case_j/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- N-test:
func: poisson_evaluations.number_test
plot_func:
- plot_poisson_consistency_test:
- plot_consistency_test:
plot_args:
title: Number consistency test
Loading