climate-ref 0.5.5__py3-none-any.whl → 0.6.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- climate_ref/cli/__init__.py +20 -6
- climate_ref/cli/datasets.py +30 -7
- climate_ref/cli/solve.py +38 -3
- climate_ref/config.py +10 -1
- climate_ref/dataset_registry/obs4ref_reference.txt +44 -13
- climate_ref/dataset_registry/sample_data.txt +8 -6
- climate_ref/datasets/base.py +62 -4
- climate_ref/datasets/cmip6.py +14 -40
- climate_ref/datasets/obs4mips.py +11 -54
- climate_ref/executor/__init__.py +2 -1
- climate_ref/executor/hpc.py +308 -0
- climate_ref/executor/local.py +24 -4
- climate_ref/executor/result_handling.py +0 -1
- climate_ref/slurm.py +192 -0
- climate_ref/solver.py +67 -6
- climate_ref/testing.py +7 -5
- {climate_ref-0.5.5.dist-info → climate_ref-0.6.1.dist-info}/METADATA +3 -2
- {climate_ref-0.5.5.dist-info → climate_ref-0.6.1.dist-info}/RECORD +22 -20
- {climate_ref-0.5.5.dist-info → climate_ref-0.6.1.dist-info}/WHEEL +0 -0
- {climate_ref-0.5.5.dist-info → climate_ref-0.6.1.dist-info}/entry_points.txt +0 -0
- {climate_ref-0.5.5.dist-info → climate_ref-0.6.1.dist-info}/licenses/LICENCE +0 -0
- {climate_ref-0.5.5.dist-info → climate_ref-0.6.1.dist-info}/licenses/NOTICE +0 -0
climate_ref/testing.py
CHANGED
|
@@ -13,20 +13,21 @@ from climate_ref.executor import handle_execution_result
|
|
|
13
13
|
from climate_ref.models import Execution, ExecutionGroup
|
|
14
14
|
from climate_ref_core.dataset_registry import dataset_registry_manager, fetch_all_files
|
|
15
15
|
from climate_ref_core.diagnostics import Diagnostic, ExecutionResult
|
|
16
|
+
from climate_ref_core.env import env
|
|
16
17
|
from climate_ref_core.pycmec.metric import CMECMetric
|
|
17
18
|
from climate_ref_core.pycmec.output import CMECOutput
|
|
18
19
|
|
|
19
20
|
|
|
20
21
|
def _determine_test_directory() -> Path | None:
|
|
21
|
-
|
|
22
|
+
path = env.path("REF_TEST_DATA_DIR", default=Path(__file__).parents[4] / "tests" / "test-data")
|
|
22
23
|
|
|
23
|
-
if not
|
|
24
|
+
if not path.exists(): # pragma: no cover
|
|
24
25
|
return None
|
|
25
|
-
return
|
|
26
|
+
return path
|
|
26
27
|
|
|
27
28
|
|
|
28
29
|
TEST_DATA_DIR = _determine_test_directory()
|
|
29
|
-
SAMPLE_DATA_VERSION = "v0.6.
|
|
30
|
+
SAMPLE_DATA_VERSION = "v0.6.3"
|
|
30
31
|
|
|
31
32
|
|
|
32
33
|
def fetch_sample_data(force_cleanup: bool = False, symlink: bool = False) -> None:
|
|
@@ -102,8 +103,9 @@ def validate_result(diagnostic: Diagnostic, config: Config, result: ExecutionRes
|
|
|
102
103
|
|
|
103
104
|
# Validate bundles
|
|
104
105
|
metric_bundle = CMECMetric.load_from_json(result.to_output_path(result.metric_bundle_filename))
|
|
106
|
+
CMECMetric.model_validate(metric_bundle)
|
|
105
107
|
bundle_dimensions = tuple(metric_bundle.DIMENSIONS.root["json_structure"])
|
|
106
|
-
assert diagnostic.facets == bundle_dimensions
|
|
108
|
+
assert diagnostic.facets == bundle_dimensions
|
|
107
109
|
CMECOutput.load_from_json(result.to_output_path(result.output_bundle_filename))
|
|
108
110
|
|
|
109
111
|
# Create a fake log file if one doesn't exist
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: climate-ref
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.6.1
|
|
4
4
|
Summary: Application which runs the CMIP Rapid Evaluation Framework
|
|
5
5
|
Author-email: Jared Lewis <jared.lewis@climate-resource.com>, Mika Pflueger <mika.pflueger@climate-resource.com>, Bouwe Andela <b.andela@esciencecenter.nl>, Jiwoo Lee <lee1043@llnl.gov>, Min Xu <xum1@ornl.gov>, Nathan Collier <collierno@ornl.gov>, Dora Hegedus <dora.hegedus@stfc.ac.uk>
|
|
6
|
-
License: Apache-2.0
|
|
6
|
+
License-Expression: Apache-2.0
|
|
7
7
|
License-File: LICENCE
|
|
8
8
|
License-File: NOTICE
|
|
9
9
|
Classifier: Development Status :: 3 - Alpha
|
|
@@ -25,6 +25,7 @@ Requires-Dist: climate-ref-core
|
|
|
25
25
|
Requires-Dist: ecgtools>=2024.7.31
|
|
26
26
|
Requires-Dist: environs>=11.0.0
|
|
27
27
|
Requires-Dist: loguru>=0.7.2
|
|
28
|
+
Requires-Dist: parsl>=2025.5.19
|
|
28
29
|
Requires-Dist: platformdirs>=4.3.6
|
|
29
30
|
Requires-Dist: sqlalchemy>=2.0.36
|
|
30
31
|
Requires-Dist: tomlkit>=0.13.2
|
|
@@ -1,31 +1,33 @@
|
|
|
1
1
|
climate_ref/__init__.py,sha256=M45QGfl0KCPK48A8MjI08weNvZHMYH__GblraQMxsoM,808
|
|
2
2
|
climate_ref/_config_helpers.py,sha256=-atI5FX7SukhLE_jz_rL-EHQ7s0YYqKu3dSFYWxSyMU,6632
|
|
3
3
|
climate_ref/alembic.ini,sha256=WRvbwSIFuZ7hWNMnR2-yHPJAwYUnwhvRYBzkJhtpGdg,3535
|
|
4
|
-
climate_ref/config.py,sha256=
|
|
4
|
+
climate_ref/config.py,sha256=SHxqdpzq-TIfAdhwk1Yt-ob96T2a3pqYcq-Wed4Ljgg,16882
|
|
5
5
|
climate_ref/constants.py,sha256=9RaNLgUSuQva7ki4eRW3TjOKeVP6T81QNiu0veB1zVk,111
|
|
6
6
|
climate_ref/database.py,sha256=b_6XHdr78Mo7KeLqQJ5DjLsySHPdQE83P8dRpdMfzfM,8661
|
|
7
7
|
climate_ref/provider_registry.py,sha256=dyfj4vU6unKHNXtT03HafQtAi3LilL37uvu3paCnmNY,4159
|
|
8
8
|
climate_ref/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
9
|
-
climate_ref/
|
|
10
|
-
climate_ref/
|
|
11
|
-
climate_ref/
|
|
9
|
+
climate_ref/slurm.py,sha256=20of7zMEeCg8BVQmy_IjSgZ8AJlYJbb8MK2Rjuzig-U,7215
|
|
10
|
+
climate_ref/solver.py,sha256=T5sQjweSvpUMG4q8MfbGjljxa5kBgKxNotT78PwyxqU,16804
|
|
11
|
+
climate_ref/testing.py,sha256=1b9lVCJlKxjJ7JGq6zDD2gK3BEM9ZVv1dbA-j6yb4Yk,4256
|
|
12
|
+
climate_ref/cli/__init__.py,sha256=q-JAiRmwTXqapJGwtfuZ2P-L1a4XAmWj3CoZKLWlP3A,4357
|
|
12
13
|
climate_ref/cli/_utils.py,sha256=6bIb8zEVvzXyKpv8MG58T-T2L2jH-G8WNrOOGpz3uCw,1918
|
|
13
14
|
climate_ref/cli/config.py,sha256=8I6CLdqKgTu6yaASy-qG0T839Fc0lDZtLSZ6YCc4wOY,520
|
|
14
|
-
climate_ref/cli/datasets.py,sha256=
|
|
15
|
+
climate_ref/cli/datasets.py,sha256=5fEh4VnQUcQKxSsFc8u6lWkOlpv7-ix-1eccK2TET9c,7890
|
|
15
16
|
climate_ref/cli/executions.py,sha256=sZXyVFYWML5mD7dE8xlsqyunsrwOIweTBDEUKCjXEpo,6798
|
|
16
17
|
climate_ref/cli/providers.py,sha256=eS9IaQxW8zGxidr8TWt7thdMU5JH53u4T3xbcIe2C_E,2455
|
|
17
|
-
climate_ref/cli/solve.py,sha256=
|
|
18
|
-
climate_ref/dataset_registry/obs4ref_reference.txt,sha256=
|
|
19
|
-
climate_ref/dataset_registry/sample_data.txt,sha256=
|
|
18
|
+
climate_ref/cli/solve.py,sha256=qc7yalXxqdcSZsoCh2ZSV7Mt6mxTKc4lg7zKpMA55Y8,2112
|
|
19
|
+
climate_ref/dataset_registry/obs4ref_reference.txt,sha256=2zJMbsAsQ49KaWziX3CqrlILq9yN7S2ygmfV3V5rsnw,8395
|
|
20
|
+
climate_ref/dataset_registry/sample_data.txt,sha256=3JAHy14pRbLlo9-oNxUXLgZ_QOFJXUieEftBbapSY8E,20124
|
|
20
21
|
climate_ref/datasets/__init__.py,sha256=PV3u5ZmhyfcHbKqySgwVA8m4-naZgxzydLXSBqdTGLM,1171
|
|
21
|
-
climate_ref/datasets/base.py,sha256=
|
|
22
|
-
climate_ref/datasets/cmip6.py,sha256=
|
|
23
|
-
climate_ref/datasets/obs4mips.py,sha256=
|
|
22
|
+
climate_ref/datasets/base.py,sha256=yoip8UCcTCUPn2xVlsJ1If9zXw_476dDYViH5iMgcIE,10352
|
|
23
|
+
climate_ref/datasets/cmip6.py,sha256=3MVJ1kPdw6f6V3G4gdHIiqDGUyMqPs-_wttkw2YKAH0,8425
|
|
24
|
+
climate_ref/datasets/obs4mips.py,sha256=CmMm4kopfb0yFsMSgUlHUm8clGJImBaodSkh6lAv_Ug,5926
|
|
24
25
|
climate_ref/datasets/pmp_climatology.py,sha256=goHDc_3B2Wdiy_hmpERNvWDdDYZACPOyFDt3Du6nGc0,534
|
|
25
26
|
climate_ref/datasets/utils.py,sha256=iLJO7h4G3DWsRe9hIC4qkIyi5_zIW1ZMw-FDASLujtM,359
|
|
26
|
-
climate_ref/executor/__init__.py,sha256=
|
|
27
|
-
climate_ref/executor/
|
|
28
|
-
climate_ref/executor/
|
|
27
|
+
climate_ref/executor/__init__.py,sha256=PYtJs3oBS_GiUHbt8BF-6wJibpF6_vREm1Cg9TxVbLI,648
|
|
28
|
+
climate_ref/executor/hpc.py,sha256=2uZkSXww-oMqmzrYmh21hwJ7Mjjpojg-AhxX8eX_8Qo,11677
|
|
29
|
+
climate_ref/executor/local.py,sha256=65LUl41YtURFb87YTWZQHjDpIRlIKJ5Ny51c9DZjy0s,8582
|
|
30
|
+
climate_ref/executor/result_handling.py,sha256=i7ZMX5vvyPY5gW-WWd-JHLi1BLviB9FXhn4FE8C9d4w,7787
|
|
29
31
|
climate_ref/executor/synchronous.py,sha256=o4TndsoKMu9AzJYLkusU9lRkgHCy6HcCP46tEs6o86U,1895
|
|
30
32
|
climate_ref/migrations/README,sha256=xM5osYbyEbEFA2eh5kwary_oh-5VFWtDubA-vgWwvlE,935
|
|
31
33
|
climate_ref/migrations/env.py,sha256=8GvBLhGTuQy6MKYMj7QszJEQ2LNewf1Z9kB9dBHQs9I,4375
|
|
@@ -39,9 +41,9 @@ climate_ref/models/diagnostic.py,sha256=YB6xzbEXdpz2j-Ddf19RV8mAiWBrkmtRmiAEUV3t
|
|
|
39
41
|
climate_ref/models/execution.py,sha256=lRCpaKLSR7rZbuoL94GW76tm9wLMsSDoIOA7bIa6xgY,9848
|
|
40
42
|
climate_ref/models/metric_value.py,sha256=44OLcZz-qLx-p_9w7YWDKpD5S7Y9HyTKKsvSb77RBro,10190
|
|
41
43
|
climate_ref/models/provider.py,sha256=RAE2qAAxwObu-72CdK4kt5ACMmKYEn07WJm7DU9hF28,990
|
|
42
|
-
climate_ref-0.
|
|
43
|
-
climate_ref-0.
|
|
44
|
-
climate_ref-0.
|
|
45
|
-
climate_ref-0.
|
|
46
|
-
climate_ref-0.
|
|
47
|
-
climate_ref-0.
|
|
44
|
+
climate_ref-0.6.1.dist-info/METADATA,sha256=X-O5GFGtgPisrdsh0VZp4v5JgqOXF9e5Kqx1jYkxbkI,4431
|
|
45
|
+
climate_ref-0.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
|
|
46
|
+
climate_ref-0.6.1.dist-info/entry_points.txt,sha256=IaggEJlDIhoYWXdXJafacWbWtCcoEqUKceP1qD7_7vU,44
|
|
47
|
+
climate_ref-0.6.1.dist-info/licenses/LICENCE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
|
48
|
+
climate_ref-0.6.1.dist-info/licenses/NOTICE,sha256=4qTlax9aX2-mswYJuVrLqJ9jK1IkN5kSBqfVvYLF3Ws,128
|
|
49
|
+
climate_ref-0.6.1.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|