From f01fbcb5c5cde0344574da57dd2f500950723ea8 Mon Sep 17 00:00:00 2001 From: awsbuild Date: Thu, 19 Sep 2024 10:10:09 +0000 Subject: [PATCH 1/9] Set version 1.28.9 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 51c3d2eba..75c188923 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.28.8 +1.28.9 From c6704e39534a148b6072b1913d8f2c5fcd41c246 Mon Sep 17 00:00:00 2001 From: sambles Date: Thu, 19 Sep 2024 11:40:51 +0100 Subject: [PATCH 2/9] Updated Package Requirements: fiona==1.10b2 twisted==24.7.0rc1 (#1117) Co-authored-by: awsbuild --- requirements-server.txt | 6 ++++-- requirements-worker.txt | 5 +---- requirements.txt | 10 ++++------ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/requirements-server.txt b/requirements-server.txt index b61efbc91..05b2a5281 100644 --- 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 index 38c99f035..0d09881bb 100644 --- a/requirements-worker.txt +++ b/requirements-worker.txt @@ -76,7 +76,7 @@ fasteners==0.18 # via -r requirements-worker.in fastparquet==2023.2.0 # via oasislmf -fiona==1.9.1 +fiona==1.10b2 # via geopandas forex-python==1.8 # via oasislmf @@ -108,8 +108,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 @@ -205,7 +203,6 @@ six==1.16.0 # azure-core # click-repl # isodate - # munch # pathlib2 # python-dateutil sqlalchemy==2.0.5.post1 diff --git a/requirements.txt b/requirements.txt index ac70be176..c72463403 100644 --- a/requirements.txt +++ b/requirements.txt @@ -187,7 +187,7 @@ filelock==3.9.0 # via # tox # virtualenv -fiona==1.9.1 +fiona==1.10b2 # via geopandas flake8==6.0.0 # via -r requirements.in @@ -212,7 +212,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 +254,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 @@ -417,7 +415,6 @@ six==1.16.0 # azure-core # click-repl # isodate - # munch # pathlib2 # python-dateutil # service-identity @@ -443,6 +440,7 @@ tomli==2.0.1 # via # build # coverage + # incremental # pyproject-api # pyproject-hooks # pytest @@ -451,7 +449,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 From c63438e8e982e3b7bb2da9a0cb793bed3188f398 Mon Sep 17 00:00:00 2001 From: Sam Gamble Date: Thu, 19 Sep 2024 13:07:05 +0100 Subject: [PATCH 3/9] Fix cI --- .github/workflows/build-images.yml | 4 ++-- .github/workflows/build-schema.yml | 4 ++-- .github/workflows/publish.yml | 8 ++++---- .github/workflows/scan.yml | 2 +- .github/workflows/test-python.yml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 546432ffb..01e08825f 100644 --- 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 index b790daf85..0ebfc5c2c 100644 --- a/.github/workflows/build-schema.yml +++ b/.github/workflows/build-schema.yml @@ -50,7 +50,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 +68,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/publish.yml b/.github/workflows/publish.yml index 9e43f1b6b..efae3c3bb 100644 --- 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 index aab53d9f9..2473c031c 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -106,7 +106,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-python.yml b/.github/workflows/test-python.yml index 17281885e..78990d827 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -63,7 +63,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 }}/ From 9ef02d330f6d465423aca3ec952b76b7308a1c7f Mon Sep 17 00:00:00 2001 From: Sam Gamble Date: Thu, 19 Sep 2024 13:22:57 +0100 Subject: [PATCH 4/9] update trigs --- .github/workflows/build-schema.yml | 7 +------ .github/workflows/scan.yml | 7 +------ .github/workflows/test-images.yml | 7 +------ .github/workflows/test-python.yml | 8 +------- 4 files changed, 4 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-schema.yml b/.github/workflows/build-schema.yml index 0ebfc5c2c..da173d2ad 100644 --- 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: diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 2473c031c..1ab423b2d 100644 --- 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 diff --git a/.github/workflows/test-images.yml b/.github/workflows/test-images.yml index 7db5ee6ae..54ab379d9 100644 --- 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: diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index 78990d827..24365188e 100644 --- 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: From 41a960eb865174939a4f6d67456fc2a1e40d8696 Mon Sep 17 00:00:00 2001 From: Sam Gamble Date: Thu, 19 Sep 2024 13:25:01 +0100 Subject: [PATCH 5/9] fix code-qual --- .github/workflows/code-quality.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml index 1464bdba9..5c0aeee5c 100644 --- 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 From 2aabcdc589869eb50914036d7e1a7b352381132f Mon Sep 17 00:00:00 2001 From: awsbuild Date: Thu, 19 Sep 2024 12:38:10 +0000 Subject: [PATCH 6/9] Set version 1.28.9 --- requirements-worker.txt | 9 ++++++--- requirements.txt | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/requirements-worker.txt b/requirements-worker.txt index 0d09881bb..6cdd72cba 100644 --- 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.10b2 - # via geopandas +fiona==1.9.6 + # via + # geopandas + # oasislmf forex-python==1.8 # via oasislmf fsspec==2023.3.0 @@ -126,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 @@ -202,6 +204,7 @@ six==1.16.0 # anytree # azure-core # click-repl + # fiona # isodate # pathlib2 # python-dateutil diff --git a/requirements.txt b/requirements.txt index c72463403..5f16630d5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -187,8 +187,10 @@ filelock==3.9.0 # via # tox # virtualenv -fiona==1.10b2 - # via geopandas +fiona==1.9.6 + # via + # geopandas + # oasislmf flake8==6.0.0 # via -r requirements.in forex-python==1.8 @@ -274,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 @@ -414,6 +416,7 @@ six==1.16.0 # automat # azure-core # click-repl + # fiona # isodate # pathlib2 # python-dateutil From 5ce54b77c528301adeb9e0ebaec1a4556abf2190 Mon Sep 17 00:00:00 2001 From: Sam Gamble Date: Thu, 19 Sep 2024 13:50:10 +0100 Subject: [PATCH 7/9] test-release From 268d0aa348f1a0864dd07e292450919b0be68ebb Mon Sep 17 00:00:00 2001 From: Sam Gamble Date: Thu, 19 Sep 2024 14:57:23 +0100 Subject: [PATCH 8/9] F --- .github/workflows/test-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-images.yml b/.github/workflows/test-images.yml index 54ab379d9..f19db8e60 100644 --- a/.github/workflows/test-images.yml +++ b/.github/workflows/test-images.yml @@ -40,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 }} From e8fe3d2593cd0046b7062b08c614112644bfe485 Mon Sep 17 00:00:00 2001 From: awsbuild Date: Thu, 19 Sep 2024 14:24:18 +0000 Subject: [PATCH 9/9] Update changelog --- CHANGELOG.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7194c34cf..b10997326 100644 --- 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