Skip to content

Commit

Permalink
chore: update dependencies and development tools
Browse files Browse the repository at this point in the history
- Update `pyproject.toml` and `poetry.lock` with new versions of dependencies
- Remove outdated packages from `pyproject.toml` and `poetry.lock`
- Modify `Makefile` to remove redundant `poetry lock` command
- Update `requirements.txt` with new dependency versions
- Update development dependencies in `pyproject.toml`

This update ensures that the project uses the latest and most secure versions of its dependencies, and removes redundant commands in the build process.
  • Loading branch information
Undertone0809 committed Nov 5, 2024
1 parent 8318ebe commit e34a236
Show file tree
Hide file tree
Showing 7 changed files with 239 additions and 299 deletions.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ endif

.PHONY: lock install pre-commit-install pre-commit-uninstall format test check-codestyle check-safety lint help

install:
lock:
poetry lock -n && poetry export --without-hashes > requirements.txt

install:
poetry install -n

pre-commit-install:
Expand Down Expand Up @@ -44,6 +46,7 @@ check-safety:
lint: test check-codestyle check-safety

help:
@echo "lock: Lock the project dependencies."
@echo "install: Install the project dependencies."
@echo "pre-commit-install: Install the pre-commit hooks."
@echo "pre-commit-uninstall: Uninstall the pre-commit hooks."
Expand Down
455 changes: 196 additions & 259 deletions poetry.lock

Large diffs are not rendered by default.

19 changes: 11 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "p3g"
version = "1.3.7"
version = "1.3.8"
description = "Python Packages Project Generator"
readme = "README.md"
authors = ["Zeeland <[email protected]>"]
Expand Down Expand Up @@ -37,19 +37,17 @@ python = "^3.8"
cookiecutter = "^2.6.0"

[tool.poetry.dev-dependencies]
bandit = "^1.7.1"
bandit = "^1.7.10"
darglint = "^1.8.1"
pre-commit = "^2.21.0"
pydocstyle = "^6.1.1"
safety = "^2.3.5"
pytest = "^7.4.3"
pytest = "^8.3.3"
pytest-html = "^4.1.1"
pytest-cov = "^5.0.0"
coverage = "^7.2.7"
coverage-badge = "^1.1.0"
pytest-html = "^3.1.1"
pytest-cov = "^5.0.0"
ruff = "^0.6.2"
black = "^22.12"
isort = {extras = ["colors"], version = "^5.10.1"}
ruff = "^0.7.2"

[tool.poetry.scripts]
p3g = "p3g.client:main"
Expand Down Expand Up @@ -156,3 +154,8 @@ branch = true
[coverage.report]
fail_under = 50
show_missing = true

[tool.darglint]
# https://github.com/terrencepreilly/darglint
strictness = "short"
docstring_style = "google"
46 changes: 24 additions & 22 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
arrow==1.2.3 ; python_version >= "3.7" and python_version < "4.0"
binaryornot==0.4.4 ; python_version >= "3.7" and python_version < "4.0"
certifi==2023.7.22 ; python_version >= "3.7" and python_version < "4.0"
chardet==5.2.0 ; python_version >= "3.7" and python_version < "4.0"
charset-normalizer==3.3.2 ; python_version >= "3.7" and python_version < "4.0"
click==8.1.7 ; python_version >= "3.7" and python_version < "4.0"
colorama==0.4.6 ; python_version >= "3.7" and python_version < "4.0" and platform_system == "Windows"
cookiecutter==1.7.3 ; python_version >= "3.7" and python_version < "4.0"
idna==3.4 ; python_version >= "3.7" and python_version < "4.0"
importlib-metadata==4.13.0 ; python_version >= "3.7" and python_version < "3.8"
jinja2-time==0.2.0 ; python_version >= "3.7" and python_version < "4.0"
jinja2==3.1.2 ; python_version >= "3.7" and python_version < "4.0"
markupsafe==2.1.3 ; python_version >= "3.7" and python_version < "4.0"
poyo==0.5.0 ; python_version >= "3.7" and python_version < "4.0"
python-dateutil==2.8.2 ; python_version >= "3.7" and python_version < "4.0"
python-slugify==8.0.1 ; python_version >= "3.7" and python_version < "4.0"
requests==2.31.0 ; python_version >= "3.7" and python_version < "4.0"
six==1.16.0 ; python_version >= "3.7" and python_version < "4.0"
text-unidecode==1.3 ; python_version >= "3.7" and python_version < "4.0"
typing-extensions==4.7.1 ; python_version >= "3.7" and python_version < "3.8"
urllib3==2.0.7 ; python_version >= "3.7" and python_version < "4.0"
zipp==3.15.0 ; python_version >= "3.7" and python_version < "3.8"
arrow==1.3.0 ; python_version >= "3.8" and python_version < "4.0"
binaryornot==0.4.4 ; python_version >= "3.8" and python_version < "4.0"
certifi==2024.8.30 ; python_version >= "3.8" and python_version < "4.0"
chardet==5.2.0 ; python_version >= "3.8" and python_version < "4.0"
charset-normalizer==3.4.0 ; python_version >= "3.8" and python_version < "4.0"
click==8.1.7 ; python_version >= "3.8" and python_version < "4.0"
colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows"
cookiecutter==2.6.0 ; python_version >= "3.8" and python_version < "4.0"
idna==3.10 ; python_version >= "3.8" and python_version < "4.0"
jinja2==3.1.4 ; python_version >= "3.8" and python_version < "4.0"
markdown-it-py==3.0.0 ; python_version >= "3.8" and python_version < "4.0"
markupsafe==2.1.5 ; python_version >= "3.8" and python_version < "4.0"
mdurl==0.1.2 ; python_version >= "3.8" and python_version < "4.0"
pygments==2.18.0 ; python_version >= "3.8" and python_version < "4.0"
python-dateutil==2.9.0.post0 ; python_version >= "3.8" and python_version < "4.0"
python-slugify==8.0.4 ; python_version >= "3.8" and python_version < "4.0"
pyyaml==6.0.2 ; python_version >= "3.8" and python_version < "4.0"
requests==2.32.3 ; python_version >= "3.8" and python_version < "4.0"
rich==13.9.4 ; python_version >= "3.8" and python_version < "4.0"
six==1.16.0 ; python_version >= "3.8" and python_version < "4.0"
text-unidecode==1.3 ; python_version >= "3.8" and python_version < "4.0"
types-python-dateutil==2.9.0.20241003 ; python_version >= "3.8" and python_version < "4.0"
typing-extensions==4.12.2 ; python_version >= "3.8" and python_version < "3.11"
urllib3==2.2.3 ; python_version >= "3.8" and python_version < "4.0"
4 changes: 0 additions & 4 deletions setup.cfg

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ lock:
poetry lock -n && poetry export --without-hashes > requirements.txt

install:
poetry lock -n && poetry export --without-hashes > requirements.txt
poetry install -n

{%- if cookiecutter.install_pre_commit %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ rich = "^10.14.0"
{%- endif %}

[tool.poetry.dev-dependencies]
pytest = "^7.4.3"
pytest-html = "^3.1.1"
pytest = "^8.3.3"
pytest-html = "^4.1.1"
pytest-cov = "^5.0.0"
bandit = "^1.7.1"
ruff = "^0.6.2"
bandit = "^1.7.10"
ruff = "^0.7.2"
{% if cookiecutter.install_pre_commit %}pre-commit = "^2.21.0"{% endif %}
{% if cookiecutter.install_coverage -%}
coverage = "^7.2.7"
Expand Down

0 comments on commit e34a236

Please sign in to comment.