Merge branch 'main' into fix/lookup_newlarkversion

OasisLMF · Sep 5, 2024 · 66ac6a0 · 66ac6a0
2 parents 11795a8 + d38a62c
commit 66ac6a0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git 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
+        retention-days: 5
diff --git 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
@@ -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
@@ -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 }}/

diff --git 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
@@ -6,7 +6,7 @@ pytest
 requests
 chardet
 PyYAML
-lark
+lark<=1.1.9
 networkx
 pyodbc
 sqlparams