bump all product versions to 2 (#378)

* bump all product versions to 2 * roleout IDB version 2.26.27 * fix test with new version number in mock object * fix test * fix for latest IDB as fallback
i4Ds · Dec 19, 2023 · e539c8b · e539c8b
1 parent f808732
commit e539c8b
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 10 deletions.
diff --git a/docs/idb_versioning.rst b/docs/idb_versioning.rst
@@ -1,7 +1,7 @@
 IDB Versioning
 ==============
 
-After a new IDB Version has been released it should be added to stixcore. All available IDB versions to stixcore are managed in the file `stixcore\data\idb\idbVersionHistory.json`
+After a new IDB Version has been released it should be added to stixcore. All available IDB versions to stixcore are managed in the file `stixcore/data/idb/idbVersionHistory.json`
 
 Follow the instructions to publish a new IDB `2.26.36` version
 
@@ -23,10 +23,10 @@ Follow the instructions to publish a new IDB `2.26.36` version
 
 .. code-block:: python
 
-    idbm = IDBManager()
-    idbm.compile_version("2.26.36")
+    from stixcore.idb.manager import IDBManager
+    IDBManager.instance.compile_version("2.26.36")
 
-* zip the `stixcore/data/idb/v2.26.36` folder into `v2.26.36.zip`
+* zip the `stixcore/data/idb/v2.26.36` folder into `v2.26.36.zip` >> `zip -r v2.26.37.zip v2.26.37`
 * upload `v2.26.36.zip` to `https://pub099.cs.technik.fhnw.ch/data/idb/` (`/var/www/data/idb/v2.26.36.zip`)
 * add a new entry to `stixcore/data/idb/idbVersionHistory.json`
     * use https://pub023.cs.technik.fhnw.ch/request/time-conversion/scet2utc

diff --git a/stixcore/data/idb/idbVersionHistory.json b/stixcore/data/idb/idbVersionHistory.json
@@ -125,14 +125,34 @@
             "validityPeriodUTC": [
                 [
                     "2021-12-09T16:01:12.414+00:00",
-                    "2136-02-07T08:11:44.778+00:00"
+                    "2024-02-15T00:00:00.000+00:00"
                 ]
             ],
             "validityPeriodOBT": [
                 {
                     "coarse": 692380776,
                     "fine": 0
                 },
+                {
+                    "coarse": 761270182,
+                    "fine": 0
+                }
+            ]
+        },
+        {
+            "version": "2.26.37",
+            "aswVersion": 184,
+            "validityPeriodUTC": [
+                [
+                    "2024-02-15T00:00:00.000+00:00",
+                    "2136-02-07T08:11:44.778+00:00"
+                ]
+            ],
+            "validityPeriodOBT": [
+                {
+                    "coarse": 761270182,
+                    "fine": 0
+                },
                 {
                     "coarse": 4294967295,
                     "fine": 0

diff --git a/stixcore/data/test/idb/v2.26.37/idb.sqlite b/stixcore/data/test/idb/v2.26.37/idb.sqlite
diff --git a/stixcore/idb/tests/test_manager.py b/stixcore/idb/tests/test_manager.py
@@ -75,7 +75,7 @@ def test_find_version(idb_manager):
 
     # fall back to the default
     idb = idb_manager.get_idb(obt=SCETime(coarse=2 ** 31 - 1, fine=0))
-    assert idb.get_idb_version() == "2.26.36"
+    assert idb.get_idb_version() == "2.26.37"
 
     assert idb_manager.find_version(obt=None) == "2.26.32"
 

diff --git a/stixcore/processing/tests/test_publish.py b/stixcore/processing/tests/test_publish.py
@@ -140,7 +140,7 @@ def test_publish_fits_to_esa_incomplete(product, out_dir):
         product.date_end = end
         product.split_to_files.return_value = [product]
         product.get_energies = False
-        product.get_processing_version.return_value = 1
+        product.get_processing_version.return_value = 2
 
         files.extend(processor.write_fits(product))
 
@@ -220,7 +220,7 @@ def test_fits_incomplete_switch_over(out_dir):
             product.date_end = end
             product.split_to_files.return_value = [product]
             product.get_energies = False
-            product.get_processing_version.return_value = 1
+            product.get_processing_version.return_value = 2
 
             files_first.extend(processor.write_fits(product))
 
@@ -340,7 +340,7 @@ def test_publish_fits_to_esa(product, out_dir):
     product.date_beg = beg
     product.date_end = end
     product.split_to_files.return_value = [product]
-    product.get_processing_version.return_value = 1
+    product.get_processing_version.return_value = 2
     product.get_energies = False
 
     data = product.data[:]  # make a clone

diff --git a/stixcore/products/product.py b/stixcore/products/product.py
@@ -171,7 +171,7 @@ class BaseProduct:
     Base TMProduct that all other product inherit from contains the registry for the factory pattern
     """
 
-    PRODUCT_PROCESSING_VERSION = 1
+    PRODUCT_PROCESSING_VERSION = 2
 
     _registry = {}