Merge pull request #1115 from OasisLMF/release/1.27.10

Release 1.27.10
OasisLMF · Sep 19, 2024 · ef95560 · ef95560
2 parents baee38b + 25c9768
commit ef95560
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 61 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.27.x' || inputs.oasislmf_branch }}
       ods_branch: ${{ github.event_name != 'workflow_dispatch' && 'stable/3.0.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:
@@ -42,7 +36,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.27.10`_
+ ---------
+* [#1001](https://github.com/OasisLMF/OasisPlatform/pull/1001) - Release 1.27.9
+* [#1116](https://github.com/OasisLMF/OasisPlatform/pull/1116) - Updated Package Requirements
+.. _`1.27.10`:  https://github.com/OasisLMF/OasisPlatform/compare/1.27.9...1.27.10
+
 `1.27.9`_
  ---------
 * [#993, #971, #784, #664, #798](https://github.com/OasisLMF/OasisPlatform/pull/994) - Logging fixes for workers 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.27.9
+1.27.10
diff --git a/requirements-server.txt b/requirements-server.txt
@@ -118,7 +118,7 @@ drf-yasg==1.21.5
     # via -r requirements-server.in
 greenlet==2.0.2
     # via sqlalchemy
-gunicorn==20.1.0
+gunicorn==22.0.0
     # via -r requirements-server.in
 hyperlink==21.0.0
     # via
@@ -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
@@ -168,6 +168,7 @@ ods-tools==3.0.8
 packaging==23.1
     # via
     #   drf-yasg
+    #   gunicorn
     #   ods-tools
 pandas==2.0.1
     # via
@@ -191,7 +192,7 @@ pycparser==2.21
     # via cffi
 pyjwt==2.7.0
     # via djangorestframework-simplejwt
-pymysql==1.0.3
+pymysql==1.1.1
     # via -r requirements-server.in
 pyopenssl==24.0.0
     # via twisted
@@ -231,11 +232,13 @@ six==1.16.0
     #   service-identity
 sqlalchemy==2.0.13
     # via -r requirements-server.in
-sqlparse==0.4.4
+sqlparse==0.5.0
     # via
     #   django
     #   django-debug-toolbar
-twisted[tls]==22.10.0
+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
@@ -83,8 +83,10 @@ fasteners==0.18
     # via -r requirements-worker.in
 fastparquet==2023.4.0
     # via oasislmf
-fiona==1.9.3
-    # via geopandas
+fiona==1.9.6
+    # via
+    #   geopandas
+    #   oasislmf
 forex-python==1.8
     # via oasislmf
 fsspec==2023.5.0
@@ -123,8 +125,6 @@ markupsafe==2.1.2
     # via jinja2
 msgpack==1.0.5
     # via oasislmf
-munch==2.5.0
-    # via fiona
 numba==0.57.0
     # via
     #   -r requirements-worker.in
@@ -142,7 +142,7 @@ numpy==1.23.5
     #   scikit-learn
     #   scipy
     #   shapely
-oasislmf[extra]==1.27.9
+oasislmf[extra]==1.27.10
     # via -r requirements-worker.in
 ods-tools==3.0.8
     # via oasislmf
@@ -170,7 +170,7 @@ pyarrow==14.0.1
     # via oasislmf
 pycparser==2.21
     # via cffi
-pymysql==1.0.3
+pymysql==1.1.1
     # via -r requirements-worker.in
 pyproj==3.5.0
     # via geopandas
@@ -224,8 +224,8 @@ six==1.16.0
     #   anytree
     #   azure-core
     #   click-repl
+    #   fiona
     #   isodate
-    #   munch
     #   pathlib2
     #   python-dateutil
 sqlalchemy==2.0.13

diff --git a/requirements.txt b/requirements.txt
@@ -194,8 +194,10 @@ filelock==3.12.0
     # via
     #   tox
     #   virtualenv
-fiona==1.9.3
-    # via geopandas
+fiona==1.9.6
+    # via
+    #   geopandas
+    #   oasislmf
 flake8==6.0.0
     # via -r requirements.in
 forex-python==1.8
@@ -206,7 +208,7 @@ geopandas==0.13.0
     # via oasislmf
 greenlet==2.0.2
     # via sqlalchemy
-gunicorn==20.1.0
+gunicorn==22.0.0
     # via -r ./requirements-server.in
 hyperlink==21.0.0
     # via
@@ -219,7 +221,7 @@ idna==3.4
     #   hyperlink
     #   requests
     #   twisted
-incremental==22.10.0
+incremental==24.7.2
     # via twisted
 inflection==0.5.1
     # via drf-yasg
@@ -266,8 +268,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.57.0
@@ -287,7 +287,7 @@ numpy==1.23.5
     #   scikit-learn
     #   scipy
     #   shapely
-oasislmf[extra]==1.27.9
+oasislmf[extra]==1.27.10
     # via -r ./requirements-worker.in
 ods-tools==3.0.8
     # via
@@ -299,6 +299,7 @@ packaging==23.1
     #   drf-yasg
     #   fastparquet
     #   geopandas
+    #   gunicorn
     #   ods-tools
     #   pyproject-api
     #   pytest
@@ -348,7 +349,7 @@ pyflakes==3.0.1
     # via flake8
 pyjwt==2.7.0
     # via djangorestframework-simplejwt
-pymysql==1.0.3
+pymysql==1.1.1
     # via
     #   -r ./requirements-server.in
     #   -r ./requirements-worker.in
@@ -432,8 +433,8 @@ six==1.16.0
     #   automat
     #   azure-core
     #   click-repl
+    #   fiona
     #   isodate
-    #   munch
     #   pathlib2
     #   python-dateutil
     #   service-identity
@@ -445,7 +446,7 @@ sqlalchemy==2.0.13
     # via
     #   -r ./requirements-server.in
     #   -r ./requirements-worker.in
-sqlparse==0.4.4
+sqlparse==0.5.0
     # via
     #   django
     #   django-debug-toolbar
@@ -461,6 +462,7 @@ tomli==2.0.1
     # via
     #   build
     #   coverage
+    #   incremental
     #   pyproject-api
     #   pyproject-hooks
     #   pytest
@@ -469,7 +471,7 @@ tox==4.5.1
     # via -r requirements.in
 tqdm==4.65.0
     # via oasislmf
-twisted[tls]==22.10.0
+twisted[tls]==24.7.0rc1
     # via
     #   -r ./requirements-server.in
     #   daphne