Merge remote-tracking branch 'refs/remotes/upstream/pyup-update-django-stubs-4.2.7-to-5.0.0' into pyup-update-mypy-1.7.1-to-1.10.0

# Conflicts:
#	{{cookiecutter.project_slug}}/requirements/local.txt
This commit is contained in:
Bruno Alla 2024-05-13 19:38:49 +01:00
commit bd5d75a246
No known key found for this signature in database
9 changed files with 59 additions and 14 deletions

View File

@ -33,7 +33,7 @@ repos:
exclude: hooks/
- repo: https://github.com/psf/black
rev: 24.4.0
rev: 24.4.2
hooks:
- id: black

View File

@ -3,6 +3,51 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
<!-- GENERATOR_PLACEHOLDER -->
## 2024.04.28
### Updated
- Update pytest to 8.2.0 ([#5034](https://github.com/cookiecutter/cookiecutter-django/pull/5034))
## 2024.04.27
### Updated
- Update sentry-sdk to 2.0.1 ([#5030](https://github.com/cookiecutter/cookiecutter-django/pull/5030))
## 2024.04.26
### Updated
- Auto-update pre-commit hooks ([#5029](https://github.com/cookiecutter/cookiecutter-django/pull/5029))
- Update ruff to 0.4.2 ([#5028](https://github.com/cookiecutter/cookiecutter-django/pull/5028))
## 2024.04.25
### Updated
- Update coverage to 7.5.0 ([#5025](https://github.com/cookiecutter/cookiecutter-django/pull/5025))
- Bump cssnano from 6.1.2 to 7.0.0 ([#5024](https://github.com/cookiecutter/cookiecutter-django/pull/5024))
- Auto-update pre-commit hooks ([#5023](https://github.com/cookiecutter/cookiecutter-django/pull/5023))
## 2024.04.24
### Changed
- Disable UP038 Ruff rule to avoid introducing slower code ([#5020](https://github.com/cookiecutter/cookiecutter-django/pull/5020))
### Updated
- Update django-allauth to 0.62.1 ([#5021](https://github.com/cookiecutter/cookiecutter-django/pull/5021))
## 2024.04.23

View File

@ -1,3 +1,3 @@
sphinx==7.3.7
sphinx-rtd-theme==2.0.0
myst-parser==3.0.0
myst-parser==3.0.1

View File

@ -4,16 +4,16 @@ binaryornot==0.4.4
# Code quality
# ------------------------------------------------------------------------------
ruff==0.4.1
ruff==0.4.2
django-upgrade==1.16.0
djlint==1.34.1
pre-commit==3.7.0
# Testing
# ------------------------------------------------------------------------------
tox==4.14.2
pytest==8.1.1
pytest-xdist==3.6.0
tox==4.15.0
pytest==8.2.0
pytest-xdist==3.6.1
pytest-cookies==0.7.0
pytest-instafail==0.5.0
pyyaml==6.0.1

View File

@ -5,7 +5,7 @@ except ImportError:
from distutils.core import setup
# We use calendar versioning
version = "2024.04.23"
version = "2024.04.28"
with open("README.md") as readme_file:
long_description = readme_file.read()

View File

@ -35,7 +35,7 @@ repos:
# Run the Ruff linter.
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.4.1
rev: v0.4.2
hooks:
# Linter
- id: ruff

View File

@ -12,7 +12,7 @@
"css-loader": "^6.5.1",
"gulp-concat": "^2.6.1",
"concurrently": "^8.0.1",
"cssnano": "^6.0.0",
"cssnano": "^7.0.0",
"gulp": "^4.0.2",
"gulp-imagemin": "^7.1.0",
"gulp-plumber": "^1.2.1",

View File

@ -14,8 +14,8 @@ watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles
# Testing
# ------------------------------------------------------------------------------
mypy==1.10.0 # https://github.com/python/mypy
django-stubs[compatible-mypy]==4.2.7 # https://github.com/typeddjango/django-stubs
pytest==8.1.1 # https://github.com/pytest-dev/pytest
django-stubs[compatible-mypy]==5.0.0 # https://github.com/typeddjango/django-stubs
pytest==8.2.0 # https://github.com/pytest-dev/pytest
pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar
{%- if cookiecutter.use_drf == "y" %}
djangorestframework-stubs[compatible-mypy]==3.14.5 # https://github.com/typeddjango/djangorestframework-stubs
@ -28,8 +28,8 @@ sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild
# Code quality
# ------------------------------------------------------------------------------
ruff==0.4.1 # https://github.com/astral-sh/ruff
coverage==7.4.4 # https://github.com/nedbat/coveragepy
ruff==0.4.2 # https://github.com/astral-sh/ruff
coverage==7.5.0 # https://github.com/nedbat/coveragepy
djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint
pre-commit==3.7.0 # https://github.com/pre-commit/pre-commit

View File

@ -8,7 +8,7 @@ psycopg[c]==3.1.18 # https://github.com/psycopg/psycopg
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
{%- endif %}
{%- if cookiecutter.use_sentry == "y" %}
sentry-sdk==1.45.0 # https://github.com/getsentry/sentry-python
sentry-sdk==2.0.1 # https://github.com/getsentry/sentry-python
{%- endif %}
{%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
hiredis==2.3.2 # https://github.com/redis/hiredis-py