diff --git a/charmcraft.yaml b/charmcraft.yaml index e748bba9ca..43ecd1d8e0 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -22,7 +22,8 @@ parts: rustup default stable # Convert subset of poetry.lock to requirements.txt - curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.8.5 python3 - + 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 d3dcbb0d3e..733d04983e 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 3f468e5999..893a0ce2a0 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,7 @@ description = Apply coding style standards to code commands_pre = poetry install --only format --no-root commands = - poetry lock --no-update + poetry lock poetry run ruff check --fix {[vars]all_path} poetry run ruff format {[vars]all_path} @@ -54,10 +54,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