From 0838ac7993622252769fc398910ef717ce0d25d1 Mon Sep 17 00:00:00 2001 From: Nicola Cerutti <94574085+ncerutti@users.noreply.github.com> Date: Thu, 5 Sep 2024 11:28:29 +0100 Subject: [PATCH 1/2] pin lark version (#143) --- requirements-extra.in | 2 +- tests/requirements.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-extra.in b/requirements-extra.in index af30a43..df6d4ca 100644 --- a/requirements-extra.in +++ b/requirements-extra.in @@ -1,5 +1,5 @@ PyYAML -lark +lark <=1.1.9 networkx pyodbc sqlparams diff --git a/tests/requirements.in b/tests/requirements.in index cff4d5b..4421360 100644 --- a/tests/requirements.in +++ b/tests/requirements.in @@ -6,7 +6,7 @@ pytest requests chardet PyYAML -lark +lark<=1.1.9 networkx pyodbc sqlparams From d38a62cf5788434d3d87468852f088a176e39469 Mon Sep 17 00:00:00 2001 From: sambles Date: Thu, 5 Sep 2024 12:10:00 +0100 Subject: [PATCH 2/2] Update GH actions artifacts to v4 (#142) * Update to v4 * retest with ODM update --- .github/workflows/build.yml | 8 ++++---- .github/workflows/publish.yml | 4 ++-- .github/workflows/test-oasislmf.yml | 2 +- .github/workflows/test.yml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ea0d90..5c25a60 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,7 +80,7 @@ jobs: - name: Download OED spec if: inputs.oed_spec_json != '' || inputs.oed_spec_branch != '' - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: extracted_spec path: ${{ github.workspace }}/ @@ -100,15 +100,15 @@ jobs: echo "source=$SRC" >> $GITHUB_OUTPUT - name: Store source package - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: src_package path: ./dist/${{ steps.build_package.outputs.source }} retention-days: 5 - name: Store Wheel package - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bin_package path: ./dist/${{ steps.build_package.outputs.wheel }} - retention-days: 5 \ No newline at end of file + retention-days: 5 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 35b7e05..c73755b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -157,13 +157,13 @@ jobs: # --- Sign packages --- # - name: Download Source package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: src_package path: ${{ github.workspace }}/ - name: Download Linux package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bin_package path: ${{ github.workspace }}/ diff --git a/.github/workflows/test-oasislmf.yml b/.github/workflows/test-oasislmf.yml index 9435c18..61e021a 100644 --- a/.github/workflows/test-oasislmf.yml +++ b/.github/workflows/test-oasislmf.yml @@ -47,7 +47,7 @@ jobs: pip install -r requirements.txt - name: Download ods-tools package - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bin_package path: ${{ github.workspace }}/ diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2df808f..dff3b83 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,13 +38,13 @@ jobs: python-version: ${{ matrix.python-version }} - name: Download package (ODS-tools) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: bin_package path: ${{ github.workspace }}/ - name: Download package (OasisDataManager) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: odm_bin_package path: ${{ github.workspace }}/