Stabilize CI runtime dependencies

Author: krowvin

.github/workflows/testing.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set Up Python
         uses: actions/setup-python@v6
         with:
-          python-version: '3.x'
+          python-version: '3.12'
 
       # Unlike the code-check workflow, this job requires the dev dependencies to be
       # installed to make sure we have the necessary, tools, stub files, etc.
@@ -25,7 +25,7 @@ jobs:
         uses: actions/cache@v5
         with:
           path: ./.venv
-          key: venv-${{ hashFiles('poetry.lock') }}
+          key: ${{ runner.os }}-py3.12-venv-${{ hashFiles('poetry.lock') }}
 
       - name: Install Dependencies
         run: poetry install

compose_files/togglz/features.properties

@@ -0,0 +1,3 @@
+AUTH_RE_ENABLE_NON_HASH_KEY_SUPPORT=true
+INCLUDE_ERROR_STACK_TRACES=true
+USE_OBJECT_STORAGE_BLOBS=false

docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - ORACLE_PASSWORD=badSYSpassword
       - CWMS_PASSWORD=simplecwmspasswD1
       - OFFICE_ID=HQ
-      - OFFICE_EROC=s0
+      - OFFICE_EROC=q0
     ports: ["1526:1521"]
     healthcheck:
       test: ["CMD", "tnsping", "FREEPDB1"]
@@ -27,7 +27,7 @@ services:
       - SYS_PASSWORD=badSYSpassword
       # set to HQ/q0 for any national system work
       - OFFICE_ID=HQ
-      - OFFICE_EROC=s0
+      - OFFICE_EROC=q0
       - INSTALLONCE=1
       - QUIET=1
     command: >
@@ -52,15 +52,17 @@ services:
         condition: service_completed_successfully
       traefik:
         condition: service_healthy
-    image: ${CWMS_DATA_API_IMAGE:-ghcr.io/usace/cwms-data-api:latest}
+    image: ${CWMS_DATA_API_IMAGE:-ghcr.io/usace/cwms-data-api:develop-2026.05.30}
     restart: unless-stopped
     volumes:
       - ./compose_files/pki/certs:/conf/
+      - ./compose_files/togglz/features.properties:/conf/features.properties:ro
       - ./compose_files/tomcat/logging.properties:/usr/local/tomcat/conf/logging.properties:ro
     environment:
+      - JAVA_OPTS=-Dproperties.file=/conf/features.properties
       - CDA_JDBC_DRIVER=oracle.jdbc.driver.OracleDriver
       - CDA_JDBC_URL=jdbc:oracle:thin:@db/FREEPDB1
-      - CDA_JDBC_USERNAME=s0webtest
+      - CDA_JDBC_USERNAME=q0webtest
       - CDA_JDBC_PASSWORD=simplecwmspasswD1
       - CDA_POOL_INIT_SIZE=5
       - CDA_POOL_MAX_ACTIVE=10
@@ -140,4 +142,3 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.traefik.rule=PathPrefix(`/traefik`)"
       - "traefik.http.routers.traefik.service=api@internal"
-

tests/cda/timeseries/timeseries_groups_test.py

@@ -155,24 +155,10 @@ def test_update_timeseries_groups():
 
 def test_delete_timeseries_group():
 
-    # update with no timeseries in the group first
-    df = pd.DataFrame(columns=["timeseries-id", "office-id", "alias"])
-
-    json_dict = tg.timeseries_group_df_to_json(
-        data=df,
+    # delete the group
+    tg.delete_timeseries_group(
         group_id=TEST_GROUP_ID,
-        group_office_id=TEST_OFFICE,
-        category_office_id=TEST_OFFICE,
         category_id=TEST_CATEGORY_ID,
-    )
-    tg.update_timeseries_groups(
-        group_id=TEST_GROUP_ID,
         office_id=TEST_OFFICE,
-        replace_assigned_ts=True,
-        data=json_dict,
-    )
-
-    # delete the group
-    tg.delete_timeseries_group(
-        group_id=TEST_GROUP_ID, category_id=TEST_CATEGORY_ID, office_id=TEST_OFFICE
+        cascade_delete=True,
     )