From c729d49b805f8fbcfe8a25731168ce51d35af0bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89loi=20Rivard?= <eloi@yaal.coop>
Date: Sun, 13 Aug 2023 14:17:46 +0200
Subject: [PATCH] chore: CI minversions python version fix attempt, again

---
 .github/workflows/tests.yaml | 5 +++--
 .gitlab-ci.yml               | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index b599c88d..ed229664 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -55,9 +55,10 @@ jobs:
         run: sudo apt --yes install apparmor-utils libsasl2-dev python3-dev libldap2-dev libssl-dev slapd ldap-utils
       - name: App armor configuration for slapd
         run: sudo aa-complain /usr/sbin/slapd
-      - name: Force minimum dependency versions
-        run: sed -i -E 's/"(\^|>=)([0-9])/"==\2/' pyproject.toml && sed -i -E 's/python = "==/python = "^/' pyproject.toml
+      - run: sed -i -E 's/"(\^|>=)([0-9\.]+)(.*)"/"==\2"/' pyproject.toml
+      - run: sed -i -E 's/python = "==/python = "^/' pyproject.toml
       - run: poetry --version
+      - run: poetry lock
       - run: poetry install
       - run: poetry run pytest
   style:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe08ab8c..8cf316a1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,8 +54,9 @@ minversions:
   image: python:3.8
   stage: test
   script:
-    - sed -i -E 's/"(\^|>=)([0-9])/"==\2/' pyproject.toml
+    - sed -i -E 's/"(\^|>=)([0-9\.]+)(.*)"/"==\2"/' pyproject.toml
     - sed -i -E 's/python = "==/python = "^/' pyproject.toml
+    - poetry lock
     - poetry install
     - poetry run pytest