Merge pull request #191 from statisticsnorway/fix-rej

Fix template conflicts
statisticsnorway · Nov 20, 2024 · 469f266 · 469f266
2 parents 352b1c5 + 304c1a5
commit 469f266
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 36 deletions.
diff --git a/.github/workflows/constraints.txt b/.github/workflows/constraints.txt
@@ -1,6 +1,6 @@
-pip==24.0
+pip==24.2
 nox==2024.4.15
 nox-poetry==1.0.3
 poetry==1.8.3
-virtualenv==20.26.2
+virtualenv==20.26.3
 pytest-mock==3.14.0
diff --git a/.github/workflows/constraints.txt.rej b/.github/workflows/constraints.txt.rej
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -61,11 +61,11 @@ jobs:
 
       - name: Publish package on PyPI
         if: steps.check-version.outputs.tag
-        uses: pypa/[email protected].0
+        uses: pypa/[email protected].1
 
       #- name: Publish package on TestPyPI We don't have the login to the TestPyPi org
       #  if: (!steps.check-version.outputs.tag)
-      #  uses: pypa/[email protected].0
+      #  uses: pypa/[email protected].1
       #  with:
       #    repository-url: https://test.pypi.org/legacy/
 

diff --git a/.github/workflows/release.yml.rej b/.github/workflows/release.yml.rej
diff --git a/.github/workflows/tests.yml.rej b/.github/workflows/tests.yml.rej