Merge pull request #1137 from OasisLMF/release/2.3.11

Release 2.3.11

.github/workflows/test-db-migration.yml

@@ -0,0 +1,62 @@
+name: DB migration Test
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      prev_release_tag:
+        description: 'OasisPlatform tag [semvar]'
+        required: false
+
+  workflow_call:
+    inputs:
+      prev_release_tag:
+        description: 'Platform tag to set the DB migration from'
+        required: false
+        type: string
+      platform_branch:
+        description: "Platform branch to migrate to (remote trigger) [git ref]"
+        required: True
+        type: string
+
+jobs:
+  DB_migrate:
+    runs-on: ubuntu-22.04
+    env:
+      PLAT_BRANCH: ${{ github.ref }}
+      PREV_RELEASE_TAG: ${{ inputs.prev_release_tag }}
+
+    steps:
+    - name: Branch selection (remote trigger)
+      if: inputs.platform_branch != ''
+      run: echo "PLAT_BRANCH=${{ inputs.platform_branch }}" >> $GITHUB_ENV
+
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        repository: OasisLMF/OasisPlatform
+        ref: ${{ env.PLAT_BRANCH }}
+        fetch-depth: 0
+
+    - name: Find 'prev_release_tag'
+      if: inputs.prev_release_tag == ''
+      run: |
+        tag=$( ./scripts/find_release.sh -t 1)
+        echo "PREV_RELEASE_TAG=$tag" >> $GITHUB_ENV
+
+    - name: Create DB to migrate from
+      run: |
+        ./scripts/create-db-sqlite3.sh ${{ env.PREV_RELEASE_TAG }}
+
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.12'
+    - run: pip install -r requirements-server.txt
+
+    - name: Run Migration
+      run: |
+        python ./manage.py migrate

CHANGELOG.rst

@@ -1,6 +1,16 @@
 OasisPlatform Changelog
 =======================
 
+`2.3.11`_
+ ---------
+* [#1125](https://github.com/OasisLMF/OasisPlatform/pull/1133) - Support Cyber models on OasisPlatform
+* [#1134](https://github.com/OasisLMF/OasisPlatform/pull/1134) - Fixed pip install on model worker images 
+* [#1139](https://github.com/OasisLMF/OasisPlatform/pull/1139) - Fix/1135 model settings conf
+* [#1129](https://github.com/OasisLMF/OasisPlatform/pull/1143) - Platform schema generation - minor changes between versions.
+* [#1140](https://github.com/OasisLMF/OasisPlatform/pull/1145) - Add DB indexing to fields like Analyses status. 
+* [#1147](https://github.com/OasisLMF/OasisPlatform/pull/1147) - Release notes script - skip merge commits
+.. _`2.3.11`:  https://github.com/OasisLMF/OasisPlatform/compare/2.3.10...2.3.11
+
 `2.3.10`_
  ---------
 * [#1121](https://github.com/OasisLMF/OasisPlatform/pull/1121) - Release 2.3.9

Dockerfile.api_server

@@ -58,6 +58,7 @@ RUN chown -R server:server /shared-fs \
 
 USER server
 RUN OASIS_API_SECRET_KEY=supersecret python3 manage.py collectstatic --noinput
+ENV PIP_BREAK_SYSTEM_PACKAGES 1
 ENV OASIS_SERVER_DB_ENGINE django.db.backends.mysql
 ENV OASIS_MEDIA_ROOT=/shared-fs
 ENV OASIS_DEBUG=false

Dockerfile.model_worker

@@ -66,6 +66,7 @@ RUN chown -R worker:worker /var/oasis \
 COPY ./VERSION ./
 USER worker
 ENV PATH=/home/worker/.local/bin:$PATH
+ENV PIP_BREAK_SYSTEM_PACKAGES 1
 ENV DEBIAN_FRONTEND=noninteractive
 ENV OASIS_MEDIA_ROOT=/shared-fs
 ENV OASIS_ENV_OVERRIDE=true

VERSION

@@ -1 +1 @@
-2.3.10
+2.3.11

kubernetes/worker-controller/requirements.txt

@@ -38,7 +38,7 @@ six==1.16.0
     # via
     #   kubernetes-asyncio
     #   python-dateutil
-urllib3==1.26.12
+urllib3==2.2.3
     # via kubernetes-asyncio
 websockets==10.3
     # via -r kubernetes/worker-controller/requirements.in

requirements-server.txt

@@ -75,9 +75,13 @@ click-repl==0.3.0
 constantly==23.10.4
     # via twisted
 coreapi==2.3.3
-    # via -r requirements-server.in
+    # via
+    #   -r requirements-server.in
+    #   drf-yasg
 coreschema==0.0.4
-    # via coreapi
+    # via
+    #   coreapi
+    #   drf-yasg
 cramjam==2.9.0
     # via fastparquet
 cryptography==43.0.3
@@ -128,7 +132,7 @@ djangorestframework-simplejwt==5.3.1
     # via -r requirements-server.in
 drf-nested-routers==0.94.0
     # via -r requirements-server.in
-drf-yasg==1.21.8
+drf-yasg==1.21.5
     # via -r requirements-server.in
 fastparquet==2024.5.0
     # via oasis-data-manager
@@ -205,7 +209,7 @@ numpy==2.0.2
     #   pyarrow
 oasis-data-manager==0.1.3
     # via ods-tools
-ods-tools==3.2.8
+ods-tools==3.2.9
     # via -r requirements-server.in
 packaging==24.1
     # via
@@ -258,8 +262,6 @@ pytz==2024.2
     #   djangorestframework
     #   drf-yasg
     #   pandas
-pyyaml==6.0.2
-    # via drf-yasg
 redis==5.1.1
     # via -r requirements-server.in
 referencing==0.35.1
@@ -275,6 +277,10 @@ rpds-py==0.20.0
     # via
     #   jsonschema
     #   referencing
+ruamel-yaml==0.18.6
+    # via drf-yasg
+ruamel-yaml-clib==0.2.12
+    # via ruamel-yaml
 s3transfer==0.10.3
     # via boto3
 service-identity==24.1.0

requirements-worker.txt

@@ -134,9 +134,9 @@ oasis-data-manager==0.1.3
     # via
     #   oasislmf
     #   ods-tools
-oasislmf[extra]==2.3.10
+oasislmf[extra]==2.3.11
     # via -r requirements-worker.in
-ods-tools==3.2.8
+ods-tools==3.2.9
     # via oasislmf
 packaging==24.1
     # via