From 68a02d8a24793c9ea0846dd5554c48514ae2a508 Mon Sep 17 00:00:00 2001
From: William Dutton <william.dutton@qld.gov.au>
Date: Wed, 11 Dec 2024 06:16:12 +1000
Subject: [PATCH 1/3] chore: enable codcov flags to know which ckan version as
 well as test results

---
 .github/workflows/test.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 26b5a108..fc93184c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -104,3 +104,12 @@ jobs:
       with:
         file: ./coverage.xml
         token: ${{ secrets.CODECOV_TOKEN }}
+        flags: "unittests,${{ matrix.ckan-version }}"
+
+    - name: Upload test results to Codecov
+      if: ${{ !cancelled() }}
+      uses: codecov/test-results-action@v1
+      with:
+        flags: "unittests,${{ matrix.ckan-version }}"
+        files: "/tmp/artifacts/junit/results.xml"
+        token: ${{ secrets.CODECOV_TOKEN }}

From d7cab4ac478ca0caa7d07e6d8204d6c9cdb53ec1 Mon Sep 17 00:00:00 2001
From: William Dutton <william.dutton@qld.gov.au>
Date: Thu, 12 Dec 2024 09:09:46 +1000
Subject: [PATCH 2/3] chore: bump frictionless, markupsafe, jinja2<3.1

---
 .github/workflows/publish.yml | 3 ---
 .github/workflows/test.yml    | 3 ---
 requirements.txt              | 5 +++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 30e50dd6..aa2a8575 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -121,9 +121,6 @@ jobs:
       run: |
         pip install -r requirements.txt
         pip install -r dev-requirements.txt
-        echo "no-warn-conflicts install of jinja2 and markupsafe"
-        pip install --no-warn-conflicts jinja2==2.10.1
-        pip install --no-warn-conflicts markupsafe==2.0.1
         pip install -e .
         # Replace default path to CKAN core config file with the one on the container
         sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fc93184c..803987ff 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -75,9 +75,6 @@ jobs:
       run: |
         pip install -r dev-requirements.txt
         pip install -r requirements.txt
-        echo "no-warn-conflicts install of jinja2 and markupsafe"
-        pip install --no-warn-conflicts jinja2==2.10.1
-        pip install --no-warn-conflicts markupsafe==2.0.1
         pip install -e .
         # Replace default path to CKAN core config file with the one on the container
         sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini
diff --git a/requirements.txt b/requirements.txt
index ee7cb38c..168e7592 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
 ckantoolkit>=0.0.3
-frictionless==5.0.0b9
-markupsafe==2.0.1
+frictionless==5.18.0
+markupsafe
+jinja2<3.1
 tableschema
 -e git+https://github.com/ckan/ckanext-scheming.git#egg=ckanext-scheming

From 6310b518eee40cca119e09403e867fff0a404c72 Mon Sep 17 00:00:00 2001
From: William Dutton <william.dutton@qld.gov.au>
Date: Thu, 12 Dec 2024 09:24:57 +1000
Subject: [PATCH 3/3] drop codcov test report as it wants old format

---
 .github/workflows/test.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 803987ff..1a75c874 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -101,12 +101,4 @@ jobs:
       with:
         file: ./coverage.xml
         token: ${{ secrets.CODECOV_TOKEN }}
-        flags: "unittests,${{ matrix.ckan-version }}"
-
-    - name: Upload test results to Codecov
-      if: ${{ !cancelled() }}
-      uses: codecov/test-results-action@v1
-      with:
-        flags: "unittests,${{ matrix.ckan-version }}"
-        files: "/tmp/artifacts/junit/results.xml"
-        token: ${{ secrets.CODECOV_TOKEN }}
+        flags: "${{ matrix.ckan-version }}"
\ No newline at end of file