Skip to content

Update Poetry + Python packages #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MebinAbraham merged 4 commits into from
Oct 25, 2024
Merged

Update Poetry + Python packages #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec4f52f
Update Python packages
MebinAbraham Oct 25, 2024
23f707c
Update Poetry
MebinAbraham Oct 25, 2024
b9a2671
Disable package mode
MebinAbraham Oct 25, 2024
497746b
Update packages
MebinAbraham Oct 25, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Install Poetry
run: pipx install poetry==1.7.1
run: pipx install poetry==1.8.3

- name: Set up Python
uses: actions/setup-python@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rename-project.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:

- name: Install Poetry
if: env.is_template == 'false' && env.needs_renaming == 'true'
run: pipx install poetry==1.7.1
run: pipx install poetry==1.8.3

- name: Set up Python
if: env.is_template == 'false' && env.needs_renaming == 'true'
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ test: ## Run the tests

.PHONY: install
install: ## Install the dependencies excluding dev.
poetry install --only main --no-root
poetry install --only main

.PHONY: install-dev
install-dev: ## Install the dependencies including dev.
poetry install --no-root
poetry install

.PHONY: megalint
megalint: ## Run the mega-linter.
Expand Down
818 changes: 428 additions & 390 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion project_template/.github/workflows/ci.yml.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v4
{%- if package_manager == 'poetry' %}
- name: Install Poetry
run: pipx install poetry==1.7.1
run: pipx install poetry==1.8.3
{%- endif %}

- name: Set up Python
Expand Down
4 changes: 2 additions & 2 deletions project_template/Makefile.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ mypy: ## Run mypy.
.PHONY: install
install: ## Install the dependencies excluding dev.
{% if package_manager == "poetry" -%}
poetry install --only main --no-root
poetry install --only main
{%- elif package_manager == "pipenv" -%}
pipenv install
{%- endif %}

.PHONY: install-dev
install-dev: ## Install the dependencies including dev.
{% if package_manager == "poetry" -%}
poetry install --no-root
poetry install
{%- elif package_manager == "pipenv" -%}
pipenv install --dev
{%- endif %}
Expand Down
340 changes: 178 additions & 162 deletions project_template/{% if not_pipenv_copier %}Pipfile.lock{% endif %}.jinja
View file
Open in desktop

Large diffs are not rendered by default.

361 changes: 192 additions & 169 deletions project_template/{% if not_poetry_copier %}poetry.lock{% endif %}.jinja
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 7 additions & 6 deletions project_template/{% if not_poetry_copier %}pyproject.toml{% endif %}.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,18 @@ description = "{{ repository_description }}"
authors = ["{{ repository_owner }}"]
license = "MIT"
readme = "README.md"
package-mode = false

[tool.poetry.dependencies]
python = "^3.10"

[tool.poetry.group.dev.dependencies]
# :TODO: Remove pylint when ruff supports all pylint rules
# :TODO: Remove black when ruff supports all black rules
pylint = "^3.1.0"
black = "^24.4.1"
pytest = "^8.1.1"
pytest-xdist = "^3.5.0"
ruff = "^0.4.2"
pylint = "^3.3.1"
black = "^24.10.0"
pytest = "^8.3.3"
pytest-xdist = "^3.6.1"
ruff = "^0.7.1"
pytest-cov = "^5.0.0"
mypy = "^1.10.0"
mypy = "^1.13.0"
799 changes: 414 additions & 385 deletions project_template/{% if pipenv_copier %}Pipfile.lock{% endif %}.jinja
View file
Open in desktop

Large diffs are not rendered by default.

869 changes: 457 additions & 412 deletions project_template/{% if poetry_copier %}poetry.lock{% endif %}.jinja
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 8 additions & 7 deletions project_template/{% if poetry_copier %}pyproject.toml{% endif %}.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@ description = "{{ repository_description }}"
authors = ["{{ repository_owner }}"]
license = "MIT"
readme = "README.md"
package-mode = false

[tool.poetry.dependencies]
python = "^3.10"

[tool.poetry.group.dev.dependencies]
# :TODO: Remove pylint when ruff supports all pylint rules
# :TODO: Remove black when ruff supports all black rules
copier = "^9.2.0"
pylint = "^3.1.0"
black = "^24.4.1"
pytest = "^8.1.1"
pytest-xdist = "^3.5.0"
ruff = "^0.4.2"
copier = "^9.4.1"
pylint = "^3.3.1"
black = "^24.10.0"
pytest = "^8.3.3"
pytest-xdist = "^3.6.1"
ruff = "^0.7.1"
pytest-cov = "^5.0.0"
mypy = "^1.10.0"
mypy = "^1.13.0"
11 changes: 6 additions & 5 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,22 @@ description = "A Python starter template designed to jump start your next Python
authors = ["ONSdigital"]
license = "MIT"
readme = "README.md"
package-mode = false

[tool.poetry.dependencies]
python = "^3.10"
copier = "^9.3.1"
copier = "^9.4.1"

[tool.poetry.group.dev.dependencies]
# :TODO: Remove pylint when ruff supports all pylint rules
pylint = "^3.2.7"
pylint = "^3.3.1"
# :TODO: Remove black when ruff supports all black rules
black = "^24.8.0"
pytest = "^8.3.2"
black = "^24.10.0"
pytest = "^8.3.3"
pytest-xdist = "^3.6.1"
ruff = "^0.6.3"
pytest-cov = "^5.0.0"
mypy = "^1.11.2"
mypy = "^1.13.0"

[build-system]
requires = ["poetry-core"]
Expand Down
1 change: 1 addition & 0 deletions scripts/package_manager_helper/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ description = "{{ repository_description }}"
authors = ["{{ repository_owner }}"]
license = "MIT"
readme = "README.md"
package-mode = false

[tool.poetry.dependencies]
python = "^3.10"
Expand Down