Merge pull request #109 from smkent/poetry

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:

.pre-commit-config.yaml

@@ -42,7 +42,7 @@ repos:
     rev: v3.16.0
     hooks:
     - id: pyupgrade
-      args: ["--keep-runtime-typing"]
+      args: ["--py39-plus", "--keep-runtime-typing"]
   - repo: local
     hooks:
     - id: mypy

README.md

@@ -31,14 +31,14 @@ Via [`pipx`][pipx]:
 ```console
 pip install pipx
 pipx install poetry
-pipx inject poetry poetry-dynamic-versioning poetry-pre-commit-plugin
+pipx inject poetry poetry-pre-commit-plugin
 ```
 
 Via `pip`:
 
 ```console
 pip install poetry
-poetry self add poetry-dynamic-versioning poetry-pre-commit-plugin
+poetry self add poetry-pre-commit-plugin
 ```
 
 ## New project creation

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")])
 

cookie_python/manage/update.py

@@ -134,3 +134,4 @@ def update_action(repo: RepoSandbox) -> None:
     repo.logger.info(f"Updated {actions_str}")
     repo.commit_changes(message)
     repo.open_pr(message)
+    repo.run(["poetry", "env", "remove", "--all"], check=False)

cookie_python/new.py

@@ -3,12 +3,11 @@
 import subprocess
 import time
 from pathlib import Path
-from typing import List, Tuple
 
 TEMPLATE_REPOSITORY_URL = "https://github.com/smkent/cookie-python"
 
 
-def parse_args() -> Tuple[argparse.Namespace, List[str]]:
+def parse_args() -> tuple[argparse.Namespace, list[str]]:
     ap = argparse.ArgumentParser()
     ap.add_argument(
         "project_dir", help="New project parent directory", type=str

hooks/post_gen_project.py

@@ -2,14 +2,13 @@
 import os
 import shutil
 import subprocess
-from typing import Dict, List
 
 import yaml
 
 TEMPLATE_ONLY_DATA = "cookiecutter_template_data"
 
 
-def _run(call: List[str], env: Dict[str, str]) -> None:
+def _run(call: list[str], env: dict[str, str]) -> None:
     subprocess.run(call, env=env).check_returncode()