diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 56cdb6b..64141af 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,6 @@ jobs: strategy: matrix: python-version: ['3.11'] - poetry-version: ['1.8.5'] steps: - uses: actions/checkout@v4 @@ -19,9 +18,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - - uses: abatilo/actions-poetry@v4 - with: - poetry-version: ${{ matrix.poetry-version }} + - uses: Gr1N/setup-poetry@v8 - name: Check dependencies run: make doctor diff --git a/.verchew.ini b/.verchew.ini index c01f7c3..4d580fe 100644 --- a/.verchew.ini +++ b/.verchew.ini @@ -11,4 +11,4 @@ version = 3 [Poetry] cli = poetry -version = 1 +version = 2 diff --git a/Makefile b/Makefile index 9ba419d..723ed46 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ endif ifndef CI poetry.lock: pyproject.toml - poetry lock --no-update + poetry lock @ touch $@ endif @@ -53,7 +53,7 @@ ifndef CI mkdir -p $(GENERATED_PROJECT)/.git echo '[remote "origin"]\nurl = https://github.com/jacebrowning/template-python-demo' > $(GENERATED_PROJECT)/.git/config endif - cd $(GENERATED_PROJECT) && poetry lock --no-update + cd $(GENERATED_PROJECT) && poetry lock @ touch $(GENERATED_PROJECT) # CLEANUP ##################################################################### diff --git a/{{cookiecutter.project_name}}/.tool-versions b/{{cookiecutter.project_name}}/.tool-versions index 948634a..5f52209 100644 --- a/{{cookiecutter.project_name}}/.tool-versions +++ b/{{cookiecutter.project_name}}/.tool-versions @@ -1,2 +1,2 @@ python 3.11.11 -poetry 1.8.5 +poetry 2.0.1 diff --git a/{{cookiecutter.project_name}}/.verchew.ini b/{{cookiecutter.project_name}}/.verchew.ini index 9874a43..1122e2c 100644 --- a/{{cookiecutter.project_name}}/.verchew.ini +++ b/{{cookiecutter.project_name}}/.verchew.ini @@ -11,7 +11,7 @@ version = 3 [Poetry] cli = poetry -version = 1 +version = 2 [Graphviz] diff --git a/{{cookiecutter.project_name}}/Makefile b/{{cookiecutter.project_name}}/Makefile index f85f9ff..634cd7f 100644 --- a/{{cookiecutter.project_name}}/Makefile +++ b/{{cookiecutter.project_name}}/Makefile @@ -40,7 +40,7 @@ $(DEPENDENCIES): poetry.lock ifndef CI poetry.lock: pyproject.toml - poetry lock --no-update + poetry lock @ touch $@ endif @@ -143,9 +143,9 @@ $(MKDOCS_INDEX): docs/requirements.txt mkdocs.yml docs/*.md poetry run mkdocs build --clean --strict docs/requirements.txt: poetry.lock - @ poetry export --with dev --without-hashes | grep mkdocs > $@ - @ poetry export --with dev --without-hashes | grep pygments >> $@ - @ poetry export --with dev --without-hashes | grep jinja2 >> $@ + @ poetry export --all-groups --without-hashes | grep mkdocs > $@ + @ poetry export --all-groups --without-hashes | grep pygments >> $@ + @ poetry export --all-groups --without-hashes | grep jinja2 >> $@ .PHONY: uml uml: install docs/*.png diff --git a/{{cookiecutter.project_name}}/pyproject.toml b/{{cookiecutter.project_name}}/pyproject.toml index dbb5632..1e50b55 100644 --- a/{{cookiecutter.project_name}}/pyproject.toml +++ b/{{cookiecutter.project_name}}/pyproject.toml @@ -34,7 +34,7 @@ python = "^{{cookiecutter.python_major_version}}.{{cookiecutter.python_minor_ver click = "*" minilog = "*" -[tool.poetry.dev-dependencies] +[tool.poetry.group.dev.dependencies] # Formatters black = "^22.1" @@ -70,6 +70,10 @@ MacFSEvents = { version = "*", platform = "darwin" } pync = { version = "*", platform = "darwin" } ipython = "^7.12.0" +[tool.poetry.requires-plugins] + +poetry-plugin-export = ">=1.8" + [tool.poetry.scripts] {{cookiecutter.project_name}} = "{{cookiecutter.package_name}}.cli:main"