Merge pull request #1120 from OasisLMF/release/1.28.10

Release 1.28.10

Author: sambles

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

@@ -0,0 +1,60 @@
+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.10
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.10'
+    - run: pip install -r requirements-server.txt
+
+    - name: Run Migration
+      run: |
+        python ./manage.py migrate

CHANGELOG.rst

@@ -1,6 +1,13 @@
 OasisPlatform Changelog
 =======================
 
+`1.28.10`_
+ ---------
+* [#1114](https://github.com/OasisLMF/OasisPlatform/pull/1114) - Release 1.28.9
+* [#1141](https://github.com/OasisLMF/OasisPlatform/pull/1141) - Add setttings from platform v2 for running the v1.28.x server on azure cloud
+* [#1146](https://github.com/OasisLMF/OasisPlatform/pull/1146) - Fix CVE issues in release 1.28.10
+.. _`1.28.10`:  https://github.com/OasisLMF/OasisPlatform/compare/1.28.9...1.28.10
+
 `1.28.9`_
  ---------
 * [#1117](https://github.com/OasisLMF/OasisPlatform/pull/1117) - Updated Package Requirements

Dockerfile.model_worker_debian

@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends git vim libspatialindex-dev && rm -rf /var/lib/apt/lists/*
 RUN adduser  --home /home/worker --shell /bin/bash --disabled-password --gecos "" worker

VERSION

@@ -1 +1 @@
-1.28.9
+1.28.10

requirements-server.txt

@@ -79,7 +79,7 @@ cryptography==42.0.4
     #   service-identity
 daphne==4.0.0
     # via -r requirements-server.in
-django==3.2.23
+django==3.2.25
     # via
     #   -r requirements-server.in
     #   channels

requirements-worker.txt

@@ -12,7 +12,6 @@ argparsetree==0.0.6
     # via oasislmf
 attrs==22.2.0
     # via
-    #   fiona
     #   jsonschema
     #   pytest
 azure-core==1.26.3
@@ -33,7 +32,7 @@ celery==5.2.7
     # via -r requirements-worker.in
 certifi==2023.7.22
     # via
-    #   fiona
+    #   pyogrio
     #   pyproj
     #   requests
 cffi==1.15.1
@@ -52,18 +51,12 @@ click==8.1.3
     #   click-didyoumean
     #   click-plugins
     #   click-repl
-    #   cligj
-    #   fiona
 click-didyoumean==0.3.0
     # via celery
 click-plugins==1.1.1
-    # via
-    #   celery
-    #   fiona
+    # via celery
 click-repl==0.2.0
     # via celery
-cligj==0.7.2
-    # via fiona
 configparser==5.3.0
     # via -r requirements-worker.in
 cramjam==2.6.2
@@ -76,15 +69,11 @@ fasteners==0.18
     # via -r requirements-worker.in
 fastparquet==2023.2.0
     # via oasislmf
-fiona==1.9.6
-    # via
-    #   geopandas
-    #   oasislmf
 forex-python==1.8
     # via oasislmf
 fsspec==2023.3.0
     # via fastparquet
-geopandas==0.12.2
+geopandas==1.0.1
     # via oasislmf
 greenlet==2.0.2
     # via sqlalchemy
@@ -115,20 +104,22 @@ numba==0.56.4
     #   -r requirements-worker.in
     #   oasislmf
     #   ods-tools
-numexpr==2.8.4
+numexpr==2.10.0
     # via oasislmf
 numpy==1.22.4
     # via
     #   fastparquet
+    #   geopandas
     #   numba
     #   numexpr
     #   oasislmf
     #   pandas
     #   pyarrow
+    #   pyogrio
     #   scikit-learn
     #   scipy
     #   shapely
-oasislmf[extra]==1.28.9
+oasislmf[extra]==1.28.10
     # via -r requirements-worker.in
 ods-tools==3.1.5
     # via oasislmf
@@ -137,6 +128,7 @@ packaging==23.0
     #   fastparquet
     #   geopandas
     #   ods-tools
+    #   pyogrio
     #   pytest
 pandas==1.5.3
     # via
@@ -158,6 +150,8 @@ pycparser==2.21
     # via cffi
 pymysql==1.1.1
     # via -r requirements-worker.in
+pyogrio==0.10.0
+    # via geopandas
 pyproj==3.4.1
     # via geopandas
 pyrsistent==0.19.3
@@ -204,7 +198,6 @@ six==1.16.0
     #   anytree
     #   azure-core
     #   click-repl
-    #   fiona
     #   isodate
     #   pathlib2
     #   python-dateutil