Migrate to Poetry 2.0

Author: smkent

.github/workflows/actions/python-poetry/action.yml

@@ -33,8 +33,8 @@ runs:
         # https://github.com/actions/runner-images/issues/6185
         PYTHON_KEYRING_BACKEND: "keyring.backends.null.Keyring"
       run: |
-        poetry install
-        poetry lock --check
+        poetry check --lock
+        poetry sync
         PROJECT_VERSION=$(poetry version -s)
         [ "${PROJECT_VERSION}" != "0.0.0" ] \
             || { echo "Versioning broken"; exit 1; }

.github/workflows/cd.yml

@@ -5,7 +5,7 @@ env:
   ENABLE_PYPI_PUBLISH: true
   ENABLE_TEST_PYPI_PUBLISH: true
   RELEASE_PYTHON_VERSION: "3.12"
-  RELEASE_POETRY_VERSION: "1.8"
+  RELEASE_POETRY_VERSION: "2.0"
 
 on:
   push:

.github/workflows/ci.yml

@@ -20,13 +20,12 @@ jobs:
         os:
           - Ubuntu
         python-version:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
         poetry-version:
-          - "1.8"
+          - "2.0"
 
     runs-on: ${{ matrix.os }}-latest
     steps:

cookie_python/manage/repo.py

@@ -117,7 +117,7 @@ def run(
         return subprocess.run(*popenargs, check=check, **kwargs)
 
     def shell(self) -> None:
-        if sys.__stdin__.isatty():
+        if sys.__stdin__ and sys.__stdin__.isatty():
             self.logger.info('Starting shell. Run "exit 1" to abort.')
             self.run([os.environ.get("SHELL", "/bin/bash")])
 

poetry.lock

@@ -1,13 +1,12 @@
 [build-system]
-requires = ["poetry-core>=1.2.0", "poetry-dynamic-versioning"]
-build-backend = "poetry_dynamic_versioning.backend"
+requires = ["poetry-core>=2.0.0,<3.0.0", "poetry-dynamic-versioning"]
+build-backend = "poetry.core.masonry.api"
 
-[tool.poetry]
+[project]
 name = "cookie-python"
-version = "0.0.0"
 description = ""
 license = "MIT"
-authors = ["Stephen Kent <smkent@smkent.net>"]
+authors = [ { name = "Stephen Kent", email = "smkent@smkent.net" } ]
 readme = "README.md"
 repository = "https://github.com/smkent/cookie-python"
 classifiers = [
@@ -17,19 +16,30 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Typing :: Typed",
 ]
+requires-python = ">=3.9"
+dynamic = [ "version" ]
+dependencies = [
+    "loguru",
+    "pygithub",
+    "pyyaml",
+    "semver",
+]
+
+[project.scripts]
+new-cookie = "cookie_python.new:main"
+manage-cookie = "cookie_python.manage.main:main"
+
+[tool.poetry]
 packages = [
     { include = "{{cookiecutter.project_name}}" }
 ]
+requires-poetry = ">=2.0"
+version = "0.0.0"
 
-[tool.poetry.dependencies]
-python = "^3.8"
-loguru = "*"
-poetry-dynamic-versioning = "*"
-pygithub = "*"
-pyyaml = "*"
-semver = "*"
+[tool.poetry.requires-plugins]
+poetry-dynamic-versioning = { version = ">=1.0.0,<2.0.0", extras = ["plugin"] }
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 bandit = {extras = ["toml"], version = "*"}
 black = "*"
 build = "*"
@@ -51,8 +61,6 @@ pytest-sugar = "*"
 types-PyYAML = "*"
 
 [tool.poetry.scripts]
-new-cookie = "cookie_python.new:main"
-manage-cookie = "cookie_python.manage.main:main"
 
 [tool.poetry-dynamic-versioning]
 enable = true

pyproject.toml

@@ -88,7 +88,7 @@ def mock_pygithub(new_cookie: Path) -> Iterator[MagicMock]:
 @pytest.fixture
 def new_cookie_with_lock(new_cookie: Path, temp_dir: str) -> Iterator[Path]:
     for cmd in (
-        ["poetry", "lock", "--no-update"],
+        ["poetry", "sync"],
         ["git", "add", "poetry.lock"],
         ["git", "commit", "-m", "Create `poetry.lock`"],
     ):

tests/test_manage_cookie.py

@@ -33,8 +33,8 @@ runs:
         # https://github.com/actions/runner-images/issues/6185
         PYTHON_KEYRING_BACKEND: "keyring.backends.null.Keyring"
       run: |
-        poetry install
-        poetry lock --check
+        poetry check --lock
+        poetry sync
         PROJECT_VERSION=$(poetry version -s)
         [ "${PROJECT_VERSION}" != "0.0.0" ] \
             || { echo "Versioning broken"; exit 1; }

{{cookiecutter.project_name}}/.github/workflows/actions/python-poetry/action.yml

@@ -5,7 +5,7 @@ env:
   ENABLE_PYPI_PUBLISH: {{ "true" if cookiecutter.enable_pypi_publish|lower == "yes" else "false" }}
   ENABLE_TEST_PYPI_PUBLISH: {{ "true" if cookiecutter.enable_pypi_publish|lower == "yes" else "false" }}
   RELEASE_PYTHON_VERSION: "3.12"
-  RELEASE_POETRY_VERSION: "1.8"
+  RELEASE_POETRY_VERSION: "2.0"
 
 on:
   push:

{{cookiecutter.project_name}}/.github/workflows/cd.yml

@@ -20,13 +20,12 @@ jobs:
         os:
           - Ubuntu
         python-version:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
           - "3.12"
         poetry-version:
-          - "1.8"
+          - "2.0"
 
     runs-on: ${{ "{{" }} matrix.os }}-latest
     steps: