From 88d74726d692b33afc7cc45ec15897482776aaaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Mon, 6 Jan 2025 15:26:26 +0100
Subject: [PATCH] Install poetry and poetry-plugin-export in github actions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 .github/workflows/tests.yml | 7 ++++---
 datanommer.commands/tox.ini | 8 +++-----
 datanommer.consumer/tox.ini | 8 +++-----
 datanommer.models/tox.ini   | 8 +++-----
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3b118360e..e4dba2ea0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -18,7 +18,8 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install pre-commit
-        run: dnf install -y pre-commit git
+        run: |
+          dnf install -y pre-commit git krb5-devel libpq-devel poetry python3-poetry-plugin-export
 
       - name: Mark the working directory as safe for Git
         run: git config --global --add safe.directory $PWD
@@ -36,7 +37,7 @@ jobs:
 
       - name: Install RPM dependencies
         run: |
-          dnf install -y krb5-devel libpq-devel
+          dnf install -y pre-commit git krb5-devel libpq-devel poetry python3-poetry-plugin-export
 
       - name: Check licenses for datanommer.${{ matrix.package }}
         run: tox -e licenses
@@ -59,7 +60,7 @@ jobs:
 
       - name: Install RPM dependencies
         run: |
-          dnf install -y timescaledb postgresql-server krb5-devel libpq-devel
+          dnf install -y timescaledb postgresql-server pre-commit git krb5-devel libpq-devel poetry python3-poetry-plugin-export
 
       - name: Run unit tests for datanommer.${{ matrix.package }}
         # Don't run the tests as root or pg_ctl will refuse to start
diff --git a/datanommer.commands/tox.ini b/datanommer.commands/tox.ini
index 9c00391ef..cf5c687e5 100644
--- a/datanommer.commands/tox.ini
+++ b/datanommer.commands/tox.ini
@@ -7,11 +7,8 @@ isolated_build = true
 passenv = HOME
 sitepackages = false
 skip_install = true
-# Use allowlist for poetry when poetry 1.2+ is more widespread
-# allowlist_externals =
-#     poetry
-deps =
-    poetry>=1.2
+allowlist_externals =
+    poetry
 env =
     SQLALCHEMY_WARN_20=1
 commands_pre =
@@ -23,6 +20,7 @@ commands =
 [testenv:licenses]
 basepython = python3.11
 allowlist_externals =
+    {[testenv]allowlist_externals}
     {toxinidir}/../tools/run-liccheck.sh
 commands =
     {toxinidir}/../tools/run-liccheck.sh
diff --git a/datanommer.consumer/tox.ini b/datanommer.consumer/tox.ini
index 9c00391ef..cf5c687e5 100644
--- a/datanommer.consumer/tox.ini
+++ b/datanommer.consumer/tox.ini
@@ -7,11 +7,8 @@ isolated_build = true
 passenv = HOME
 sitepackages = false
 skip_install = true
-# Use allowlist for poetry when poetry 1.2+ is more widespread
-# allowlist_externals =
-#     poetry
-deps =
-    poetry>=1.2
+allowlist_externals =
+    poetry
 env =
     SQLALCHEMY_WARN_20=1
 commands_pre =
@@ -23,6 +20,7 @@ commands =
 [testenv:licenses]
 basepython = python3.11
 allowlist_externals =
+    {[testenv]allowlist_externals}
     {toxinidir}/../tools/run-liccheck.sh
 commands =
     {toxinidir}/../tools/run-liccheck.sh
diff --git a/datanommer.models/tox.ini b/datanommer.models/tox.ini
index 7d4b94291..0d20b511a 100644
--- a/datanommer.models/tox.ini
+++ b/datanommer.models/tox.ini
@@ -7,11 +7,8 @@ isolated_build = true
 passenv = HOME
 sitepackages = false
 skip_install = true
-# Use allowlist for poetry when poetry 1.2+ is more widespread
-# allowlist_externals =
-#     poetry
-deps =
-    poetry>=1.2
+allowlist_externals =
+    poetry
 env =
     SQLALCHEMY_WARN_20=1
 commands_pre =
@@ -21,6 +18,7 @@ commands =
 
 [testenv:licenses]
 allowlist_externals =
+    {[testenv]allowlist_externals}
     {toxinidir}/../tools/run-liccheck.sh
 commands =
     {toxinidir}/../tools/run-liccheck.sh