Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ jobs:
strategy:
matrix:
python-version: ['3.11']
poetry-version: ['1.8.5']

steps:
- uses: actions/checkout@v4
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .verchew.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ version = 3
[Poetry]

cli = poetry
version = 1
version = 2
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ endif

ifndef CI
poetry.lock: pyproject.toml
poetry lock --no-update
poetry lock
@ touch $@
endif

Expand All @@ -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 #####################################################################
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_name}}/.tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
python 3.11.11
poetry 1.8.5
poetry 2.0.1
2 changes: 1 addition & 1 deletion {{cookiecutter.project_name}}/.verchew.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ version = 3
[Poetry]

cli = poetry
version = 1
version = 2

[Graphviz]

Expand Down
8 changes: 4 additions & 4 deletions {{cookiecutter.project_name}}/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ $(DEPENDENCIES): poetry.lock

ifndef CI
poetry.lock: pyproject.toml
poetry lock --no-update
poetry lock
@ touch $@
endif

Expand Down Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion {{cookiecutter.project_name}}/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Loading