Merge pull request #1114 from OasisLMF/release/1.28.9

Release 1.28.9
OasisLMF · Sep 19, 2024 · 1bf178e · 1bf178e
2 parents 3edbbd9 + e8fe3d2
commit 1bf178e
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 54 deletions.
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -149,7 +149,7 @@ jobs:
 
     - name: Store image size report
       if: success() || failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.dive }}
         path: ${{ matrix.dive }}
@@ -187,7 +187,7 @@ jobs:
 
     - name: Store CVE report
       if: success() || failure() && env.SEVERITY != 'SKIP'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.report }}
         path: ${{ matrix.report }}

diff --git a/.github/workflows/build-schema.yml b/.github/workflows/build-schema.yml
@@ -3,14 +3,9 @@ name: Platform Schema (OpenAPI)
 on:
   push:
     branches:
-      - main-platform1
+      - main
       - stable**
-      - release**
   pull_request:
-    branches:
-      - main-platform1
-      - stable**
-      - release**
   workflow_dispatch:
     inputs:
       ods_branch:
@@ -50,7 +45,7 @@ jobs:
 
     - name: Download package
       if: needs.ods_tools.outputs.whl_filename != ''
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: bin_package
         path: ${{ github.workspace }}/
@@ -68,7 +63,7 @@ jobs:
         python ./manage.py generate_swagger ${{ env.SCHEMA }}
 
     - name: Store OpenAPI schema
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: openapi-schema
         path: ${{ env.SCHEMA }}

diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -5,7 +5,7 @@
 
 name: Code Quality
 
-on: [push, pull_request]
+on: [pull_request]
 
 env:
   max_line_length: 150

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -321,21 +321,21 @@ jobs:
         docker run --entrypoint "eve" ${{ needs.build_images.outputs.worker_image }} '-v' 2> KTOOLS_VERSION
 
     - name: 'store OASISLMF_VERSION'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: OASISLMF_VERSION
         path: OASISLMF_VERSION
         retention-days: 5
 
     - name: 'store ODS_VERSION'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ODS_VERSION
         path: ODS_VERSION
         retention-days: 5
 
     - name: 'store KTOOLS_VERSION'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: KTOOLS_VERSION
         path: KTOOLS_VERSION
@@ -353,7 +353,7 @@ jobs:
         test "v$KTOOL_VER" = ${{ env.ktools_release }} || exit 1
 
     - name: Download API schema
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: openapi-schema
         path: ${{ github.workspace }}/

diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
@@ -3,14 +3,9 @@ name: Platform Vulnerability Scanning
 on:
   push:
     branches:
-      - main-platform1
+      - main
       - stable**
-      - release**
   pull_request:
-    branches:
-      - main-platform1
-      - stable**
-      - release**
   schedule:
     - cron:  '0 */6 * * *' # Run scan every 6 hours
 
@@ -106,7 +101,7 @@ jobs:
 
     - name: Store CVE report
       if: success() || failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.REPORT }}
         path: ${{ env.REPORT }}

diff --git a/.github/workflows/test-images.yml b/.github/workflows/test-images.yml
@@ -3,14 +3,9 @@ name: Platform Image Tests
 on:
   push:
     branches:
-      - main-platform1
+      - main
       - stable**
-      - release**
   pull_request:
-    branches:
-      - main-platform1
-      - stable**
-      - release**
   workflow_dispatch:
     inputs:
       last_release:
@@ -45,7 +40,7 @@ jobs:
     with:
       docker_push: true
       ignore_unfixed: true
-      cve_severity: ${{ github.event_name != 'workflow_dispatch' && 'CRITICAL,HIGH' ||  inputs.cve_severity }}
+      cve_severity: ${{ github.event_name != 'workflow_dispatch' && 'SKIP' ||  inputs.cve_severity }}
       oasislmf_branch: ${{ github.event_name != 'workflow_dispatch' && 'stable/1.28.x' || inputs.oasislmf_branch }}
       ods_branch: ${{ github.event_name != 'workflow_dispatch' && 'stable/3.1.x' || inputs.ods_branch }}
 

diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
@@ -3,15 +3,9 @@ name: Platform Python Tests
 on:
   push:
     branches:
-      - main-platform1
+      - main
       - stable**
-      - release**
   pull_request:
-    branches:
-      - main-platform1
-      - stable**
-      - release**
-
   workflow_dispatch:
     inputs:
       ods_branch:
@@ -63,7 +57,7 @@ jobs:
 
     - name: Download package
       if: needs.ods_tools.outputs.whl_filename != ''
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: bin_package
         path: ${{ github.workspace }}/

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 OasisPlatform Changelog
 =======================
 
+`1.28.9`_
+ ---------
+* [#1117](https://github.com/OasisLMF/OasisPlatform/pull/1117) - Updated Package Requirements
+* [#1046](https://github.com/OasisLMF/OasisPlatform/pull/1046) - Release 1.28.8 (30th May 2024)
+.. _`1.28.9`:  https://github.com/OasisLMF/OasisPlatform/compare/1.28.8...1.28.9
+
 `1.28.8`_
  ---------
 * [#1000](https://github.com/OasisLMF/OasisPlatform/pull/1000) - Release 1.28.7

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.28.8
+1.28.9
diff --git a/requirements-server.txt b/requirements-server.txt
@@ -129,7 +129,7 @@ idna==3.4
     #   hyperlink
     #   requests
     #   twisted
-incremental==22.10.0
+incremental==24.7.2
     # via twisted
 inflection==0.5.1
     # via drf-yasg
@@ -241,7 +241,9 @@ sqlparse==0.5.0
     # via
     #   django
     #   django-debug-toolbar
-twisted[tls]==23.10.0rc1
+tomli==2.0.1
+    # via incremental
+twisted[tls]==24.7.0rc1
     # via
     #   -r requirements-server.in
     #   daphne

diff --git a/requirements-worker.txt b/requirements-worker.txt
@@ -76,8 +76,10 @@ fasteners==0.18
     # via -r requirements-worker.in
 fastparquet==2023.2.0
     # via oasislmf
-fiona==1.9.1
-    # via geopandas
+fiona==1.9.6
+    # via
+    #   geopandas
+    #   oasislmf
 forex-python==1.8
     # via oasislmf
 fsspec==2023.3.0
@@ -108,8 +110,6 @@ llvmlite==0.39.1
     # via numba
 msgpack==1.0.5
     # via oasislmf
-munch==2.5.0
-    # via fiona
 numba==0.56.4
     # via
     #   -r requirements-worker.in
@@ -128,7 +128,7 @@ numpy==1.22.4
     #   scikit-learn
     #   scipy
     #   shapely
-oasislmf[extra]==1.28.8
+oasislmf[extra]==1.28.9
     # via -r requirements-worker.in
 ods-tools==3.1.5
     # via oasislmf
@@ -204,8 +204,8 @@ six==1.16.0
     #   anytree
     #   azure-core
     #   click-repl
+    #   fiona
     #   isodate
-    #   munch
     #   pathlib2
     #   python-dateutil
 sqlalchemy==2.0.5.post1

diff --git a/requirements.txt b/requirements.txt
@@ -187,8 +187,10 @@ filelock==3.9.0
     # via
     #   tox
     #   virtualenv
-fiona==1.9.1
-    # via geopandas
+fiona==1.9.6
+    # via
+    #   geopandas
+    #   oasislmf
 flake8==6.0.0
     # via -r requirements.in
 forex-python==1.8
@@ -212,7 +214,7 @@ idna==3.4
     #   hyperlink
     #   requests
     #   twisted
-incremental==22.10.0
+incremental==24.7.2
     # via twisted
 inflection==0.5.1
     # via drf-yasg
@@ -254,8 +256,6 @@ model-mommy==2.0.0
     # via -r requirements.in
 msgpack==1.0.5
     # via oasislmf
-munch==2.5.0
-    # via fiona
 mysqlclient==2.1.1
     # via -r ./requirements-server.in
 numba==0.56.4
@@ -276,7 +276,7 @@ numpy==1.22.4
     #   scikit-learn
     #   scipy
     #   shapely
-oasislmf[extra]==1.28.8
+oasislmf[extra]==1.28.9
     # via -r ./requirements-worker.in
 ods-tools==3.1.5
     # via
@@ -416,8 +416,8 @@ six==1.16.0
     #   automat
     #   azure-core
     #   click-repl
+    #   fiona
     #   isodate
-    #   munch
     #   pathlib2
     #   python-dateutil
     #   service-identity
@@ -443,6 +443,7 @@ tomli==2.0.1
     # via
     #   build
     #   coverage
+    #   incremental
     #   pyproject-api
     #   pyproject-hooks
     #   pytest
@@ -451,7 +452,7 @@ tox==4.4.7
     # via -r requirements.in
 tqdm==4.65.0
     # via oasislmf
-twisted[tls]==23.10.0rc1
+twisted[tls]==24.7.0rc1
     # via
     #   -r ./requirements-server.in
     #   daphne