Tag new version v1.5.0

tum-esm · Nov 30, 2024 · f6587d2 · f6587d2
1 parent 366e014
commit f6587d2
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 39 deletions.
diff --git a/config/config.template.json b/config/config.template.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.4",
+  "version": "1.5",
   "general": {
     "metadata": {
       "github_repository": "tum-esm/em27-metadata-storage",

diff --git a/docs/components/config-schema.ts b/docs/components/config-schema.ts
@@ -4,7 +4,7 @@ const CONFIG_SCHEMA: any = {
     "description": "A pydantic model describing the config file schema.",
     "properties": {
         "version": {
-            "const": "1.4",
+            "const": "1.5",
             "description": "Version of the retrieval pipeline which is compatible with this config file. Retrievals done with any version `1.x` will produce the same output files as retrievals done with version `1.0`. But higher version numbers might use a different config file structure and produce more output files.",
             "title": "Version",
             "type": "string"

diff --git a/docs/pages/api-reference/configuration.mdx b/docs/pages/api-reference/configuration.mdx
@@ -10,7 +10,7 @@ import {
 
 ```json
 {
-    "version": "1.4",
+    "version": "1.5",
     "general": {
         "metadata": {
             "github_repository": "tum-esm/em27-metadata-storage",

diff --git a/docs/pages/guides/configuration.mdx b/docs/pages/guides/configuration.mdx
@@ -18,7 +18,7 @@ Template:
 
 ```json
 {
-    "version": "1.4",
+    "version": "1.5",
     "general": {
         "metadata": {
             "github_repository": "tum-esm/em27-metadata-storage",

diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "em27-retrieval-pipeline"
-version = "1.4.1"
+version = "1.5.0"
 description = "automated EM27 data processing"
 authors = [
     { name = "Moritz Makowski", email = "[email protected]" },

diff --git a/src/retrieval/algorithms/proffast-1.0/main/.gitignore b/src/retrieval/algorithms/proffast-1.0/main/.gitignore
@@ -1 +1,2 @@
-prf
+prf
+2021-03-08_prf96-EM27-fast
diff --git a/src/types/config.py b/src/types/config.py
@@ -461,7 +461,7 @@ class Config(pydantic.BaseModel):
 
     model_config = pydantic.ConfigDict(extra="forbid")
 
-    version: Literal["1.4"] = pydantic.Field(
+    version: Literal["1.5"] = pydantic.Field(
         ...,
         description="Version of the retrieval pipeline which is compatible with this config file. Retrievals done with any version `1.x` will produce the same output files as retrievals done with version `1.0`. But higher version numbers might use a different config file structure and produce more output files.",
     )

diff --git a/tests/bundle/test_bundling.py b/tests/bundle/test_bundling.py
@@ -12,8 +12,7 @@
 BUNDLE_OUTPUT_DIR = os.path.join(PROJECT_DIR, "data", "testing", "bundle", "outputs")
 
 CONFIG = {
-    "version":
-        "1.4",
+    "version": "1.5",
     "general": {
         "metadata": None,
         "data": {
@@ -33,20 +32,25 @@
             "results": os.path.join(INPUT_DATA_DIR, "results"),
         },
     },
-    "profiles":
-        None,
-    "retrieval":
-        None,
-    "bundles": [{
-        "dst_dir": BUNDLE_OUTPUT_DIR,
-        "output_formats": ["csv", "parquet"],
-        "sensor_ids": ["so", "mc"],
-        "retrieval_algorithms": ["proffast-1.0", "proffast-2.2", "proffast-2.3", "proffast-2.4"],
-        "atmospheric_profile_models": ["GGG2014", "GGG2020"],
-        "from_datetime": "2017-01-01T00:00:00+0000",
-        "to_datetime": "2024-12-31T23:59:59+0000",
-        "parse_dc_timeseries": True,
-    }],
+    "profiles": None,
+    "retrieval": None,
+    "bundles": [
+        {
+            "dst_dir": BUNDLE_OUTPUT_DIR,
+            "output_formats": ["csv", "parquet"],
+            "sensor_ids": ["so", "mc"],
+            "retrieval_algorithms": [
+                "proffast-1.0",
+                "proffast-2.2",
+                "proffast-2.3",
+                "proffast-2.4",
+            ],
+            "atmospheric_profile_models": ["GGG2014", "GGG2020"],
+            "from_datetime": "2017-01-01T00:00:00+0000",
+            "to_datetime": "2024-12-31T23:59:59+0000",
+            "parse_dc_timeseries": True,
+        }
+    ],
 }
 
 
@@ -68,7 +72,7 @@ def test_bundling(download_sample_data: None) -> None:
             locations_path=os.path.join(METADATA_DIR, "locations.json"),
             sensors_path=os.path.join(METADATA_DIR, "sensors.json"),
             campaigns_path=os.path.join(METADATA_DIR, "campaigns.json"),
-        )
+        ),
     )
 
     bundle = config.bundles[0]
@@ -80,14 +84,16 @@ def test_bundling(download_sample_data: None) -> None:
                 if retrieval_algorithm == "proffast-1.0" and atmospheric_profile_model == "GGG2020":
                     continue
 
-                filename = "-".join([
-                    "em27-retrieval-bundle",
-                    sensor_id,
-                    retrieval_algorithm,
-                    atmospheric_profile_model,
-                    bundle.from_datetime.strftime("%Y%m%d"),
-                    bundle.to_datetime.strftime("%Y%m%d"),
-                ])
+                filename = "-".join(
+                    [
+                        "em27-retrieval-bundle",
+                        sensor_id,
+                        retrieval_algorithm,
+                        atmospheric_profile_model,
+                        bundle.from_datetime.strftime("%Y%m%d"),
+                        bundle.to_datetime.strftime("%Y%m%d"),
+                    ]
+                )
                 # fmt: off
                 csv_path = os.path.join(BUNDLE_OUTPUT_DIR, f"{filename}.csv")
                 assert os.path.exists(csv_path), f"Expected file {csv_path} does not exist."