From 41cc71860b15342d46a9df9c2d9ca2f6b236e884 Mon Sep 17 00:00:00 2001
From: Carl Csaposs <carl.csaposs@canonical.com>
Date: Tue, 7 Jan 2025 10:06:14 +0100
Subject: [PATCH] Use poetry v2

---
 charmcraft.yaml | 1 +
 pyproject.toml  | 1 +
 tox.ini         | 6 +-----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/charmcraft.yaml b/charmcraft.yaml
index 21e451eb7..76181d1b7 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -31,6 +31,7 @@ parts:
 
       # Convert subset of poetry.lock to requirements.txt
       curl -sSL https://install.python-poetry.org | python3 -
+      /root/.local/bin/poetry self add poetry-plugin-export
       /root/.local/bin/poetry export --only main,charm-libs --output requirements.txt
 
       craftctl default
diff --git a/pyproject.toml b/pyproject.toml
index 9118dd234..dd53e9e83 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,6 +3,7 @@
 
 [tool.poetry]
 package-mode = false
+requires-poetry = ">=2.0.0"
 
 [tool.poetry.dependencies]
 python = "^3.10"
diff --git a/tox.ini b/tox.ini
index 8f45b3efe..37dc24df4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,7 +23,7 @@ description = Apply coding style standards to code
 commands_pre =
     poetry install --only format
 commands =
-    poetry lock --no-update
+    poetry lock
     poetry run ruff check --fix {[vars]all_path}
     poetry run ruff format {[vars]all_path}
 
@@ -57,10 +57,6 @@ commands =
 
 [testenv:integration]
 description = Run integration tests
-set_env =
-    {[testenv]set_env}
-    # Workaround for https://github.com/python-poetry/poetry/issues/6958
-    POETRY_INSTALLER_PARALLEL = false
 pass_env =
     CI
     GITHUB_OUTPUT