mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2025-08-08 14:04:52 +03:00
Merge branch 'refs/heads/master' into rename-docker-compose
This commit is contained in:
commit
05f761beab
5
.github/contributors.json
vendored
5
.github/contributors.json
vendored
|
@ -1558,5 +1558,10 @@
|
||||||
"name": "farwill",
|
"name": "farwill",
|
||||||
"github_login": "farwill",
|
"github_login": "farwill",
|
||||||
"twitter_username": ""
|
"twitter_username": ""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "quroom",
|
||||||
|
"github_login": "quroom",
|
||||||
|
"twitter_username": ""
|
||||||
}
|
}
|
||||||
]
|
]
|
2
.github/workflows/update-changelog.yml
vendored
2
.github/workflows/update-changelog.yml
vendored
|
@ -8,7 +8,7 @@ on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
release:
|
update:
|
||||||
# Disables this workflow from running in a repository that is not part of the indicated organization/user
|
# Disables this workflow from running in a repository that is not part of the indicated organization/user
|
||||||
if: github.repository_owner == 'cookiecutter'
|
if: github.repository_owner == 'cookiecutter'
|
||||||
|
|
||||||
|
|
2
.github/workflows/update-contributors.yml
vendored
2
.github/workflows/update-contributors.yml
vendored
|
@ -33,7 +33,7 @@ jobs:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Commit changes
|
- name: Commit changes
|
||||||
uses: stefanzweifel/git-auto-commit-action@v5.0.0
|
uses: stefanzweifel/git-auto-commit-action@v5.0.1
|
||||||
with:
|
with:
|
||||||
commit_message: Update Contributors
|
commit_message: Update Contributors
|
||||||
file_pattern: CONTRIBUTORS.md .github/contributors.json
|
file_pattern: CONTRIBUTORS.md .github/contributors.json
|
||||||
|
|
|
@ -33,7 +33,7 @@ repos:
|
||||||
exclude: hooks/
|
exclude: hooks/
|
||||||
|
|
||||||
- repo: https://github.com/psf/black
|
- repo: https://github.com/psf/black
|
||||||
rev: 24.3.0
|
rev: 24.4.2
|
||||||
hooks:
|
hooks:
|
||||||
- id: black
|
- id: black
|
||||||
|
|
||||||
|
|
193
CHANGELOG.md
193
CHANGELOG.md
|
@ -3,6 +3,199 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
|
||||||
|
|
||||||
<!-- GENERATOR_PLACEHOLDER -->
|
<!-- GENERATOR_PLACEHOLDER -->
|
||||||
|
|
||||||
|
## 2024.05.11
|
||||||
|
|
||||||
|
|
||||||
|
### Updated
|
||||||
|
|
||||||
|
- Update pre-commit to 3.7.1 ([#5066](https://github.com/cookiecutter/cookiecutter-django/pull/5066))
|
||||||
|
|
||||||
|
- Auto-update pre-commit hooks ([#5067](https://github.com/cookiecutter/cookiecutter-django/pull/5067))
|
||||||
|
|
||||||
|
## 2024.05.10
|
||||||
|
|
||||||
|
|
||||||
|
### Updated
|
||||||
|
|
||||||
|
- Update psycopg to 3.1.19 ([#5064](https://github.com/cookiecutter/cookiecutter-django/pull/5064))
|
||||||
|
|
||||||
|
- Update django-upgrade to 1.17.0 ([#5065](https://github.com/cookiecutter/cookiecutter-django/pull/5065))
|
||||||
|
|
||||||
|
- Auto-update pre-commit hooks ([#5062](https://github.com/cookiecutter/cookiecutter-django/pull/5062))
|
||||||
|
|
||||||
|
- Update ruff to 0.4.4 ([#5061](https://github.com/cookiecutter/cookiecutter-django/pull/5061))
|
||||||
|
|
||||||
|
## 2024.05.07
|
||||||
|
|
||||||
|
|
||||||
|
### Updated
|
||||||
|
|
||||||
|
- Update django to 4.2.13 ([#5058](https://github.com/cookiecutter/cookiecutter-django/pull/5058))
|
||||||
|
|
||||||
|
## 2024.05.06
|
||||||
|
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fix nginx image name in production.yml ([#5053](https://github.com/cookiecutter/cookiecutter-django/pull/5053))
|
||||||
|
|
||||||
|
### Updated
|
||||||
|
|
||||||
|
- Update django-model-utils to 4.5.1 ([#5044](https://github.com/cookiecutter/cookiecutter-django/pull/5044))
|
||||||
|
|
||||||
|
- Update django to 4.2.12 ([#5056](https://github.com/cookiecutter/cookiecutter-django/pull/5056))
|
||||||
|
|
||||||
|
- Update sentry-sdk to 2.1.1 ([#5055](https://github.com/cookiecutter/cookiecutter-django/pull/5055))
|
||||||
|
|
||||||
|
- Update ruff to 0.4.3 ([#5049](https://github.com/cookiecutter/cookiecutter-django/pull/5049))
|
||||||
|
|
||||||
|
## 2024.05.05
|
||||||
|
|
||||||
|
|
||||||
|
### Updated
|
||||||
|
|
||||||
|
- Auto-update pre-commit hooks ([#5046](https://github.com/cookiecutter/cookiecutter-django/pull/5046))
|
||||||
|
|
||||||
|
- Update django-storages to 1.14.3 ([#5047](https://github.com/cookiecutter/cookiecutter-django/pull/5047))
|
||||||
|
|
||||||
|
- Update coverage to 7.5.1 ([#5048](https://github.com/cookiecutter/cookiecutter-django/pull/5048))
|
||||||
|
|
||||||
|
## 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
|
||||||
|
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Update link to djlint on pyproject.toml ([#5019](https://github.com/cookiecutter/cookiecutter-django/pull/5019))
|
||||||
|
|
||||||
|
### Updated
|
||||||
|
|
||||||
|
- Update redis to 5.0.4 ([#5018](https://github.com/cookiecutter/cookiecutter-django/pull/5018))
|
||||||
|
|
||||||
|
- Update django-allauth to 0.62.0 ([#5016](https://github.com/cookiecutter/cookiecutter-django/pull/5016))
|
||||||
|
|
||||||
|
## 2024.04.22
|
||||||
|
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fix broken link for sphinx-doc in generated docs ([#5015](https://github.com/cookiecutter/cookiecutter-django/pull/5015))
|
||||||
|
|
||||||
|
## 2024.04.20
|
||||||
|
|
||||||
|
|
||||||
|
### Updated
|
||||||
|
|
||||||
|
- Auto-update pre-commit hooks ([#5014](https://github.com/cookiecutter/cookiecutter-django/pull/5014))
|
||||||
|
|
||||||
|
- Update pytest-xdist to 3.6.0 ([#5013](https://github.com/cookiecutter/cookiecutter-django/pull/5013))
|
||||||
|
|
||||||
|
## 2024.04.19
|
||||||
|
|
||||||
|
|
||||||
|
### Updated
|
||||||
|
|
||||||
|
- Update ruff to 0.4.1 ([#5011](https://github.com/cookiecutter/cookiecutter-django/pull/5011))
|
||||||
|
|
||||||
|
- Update ruff to 0.4.0 ([#5007](https://github.com/cookiecutter/cookiecutter-django/pull/5007))
|
||||||
|
|
||||||
|
- Auto-update pre-commit hooks ([#5008](https://github.com/cookiecutter/cookiecutter-django/pull/5008))
|
||||||
|
|
||||||
|
- Update sphinx to 7.3.7 ([#5010](https://github.com/cookiecutter/cookiecutter-django/pull/5010))
|
||||||
|
|
||||||
|
## 2024.04.18
|
||||||
|
|
||||||
|
|
||||||
|
### Updated
|
||||||
|
|
||||||
|
- Update celery to 5.4.0 ([#5005](https://github.com/cookiecutter/cookiecutter-django/pull/5005))
|
||||||
|
|
||||||
|
- Update sphinx to 7.3.6 ([#5004](https://github.com/cookiecutter/cookiecutter-django/pull/5004))
|
||||||
|
|
||||||
|
## 2024.04.17
|
||||||
|
|
||||||
|
|
||||||
|
### Updated
|
||||||
|
|
||||||
|
- Update sphinx to 7.3.5 ([#5003](https://github.com/cookiecutter/cookiecutter-django/pull/5003))
|
||||||
|
|
||||||
|
- Update gunicorn to 22.0.0 ([#5001](https://github.com/cookiecutter/cookiecutter-django/pull/5001))
|
||||||
|
|
||||||
|
- Update sphinx to 7.3.3 ([#5000](https://github.com/cookiecutter/cookiecutter-django/pull/5000))
|
||||||
|
|
||||||
|
## 2024.04.16
|
||||||
|
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- Add a prefix setting so that swagger tags are generated in a readable way ([#4975](https://github.com/cookiecutter/cookiecutter-django/pull/4975))
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fix `runserver_plus` hot-reload when under Windows + Docker ([#4971](https://github.com/cookiecutter/cookiecutter-django/pull/4971))
|
||||||
|
|
||||||
|
### Documentation
|
||||||
|
|
||||||
|
- Update docs for `test_bare.sh` ([#4996](https://github.com/cookiecutter/cookiecutter-django/pull/4996))
|
||||||
|
|
||||||
|
### Updated
|
||||||
|
|
||||||
|
- Bump traefik from 2.11.0 to 2.11.2 ([#4993](https://github.com/cookiecutter/cookiecutter-django/pull/4993))
|
||||||
|
|
||||||
|
- Update sphinx-autobuild to 2024.4.16 ([#4999](https://github.com/cookiecutter/cookiecutter-django/pull/4999))
|
||||||
|
|
||||||
|
- Update sphinx-autobuild to 2024.4.13 ([#4991](https://github.com/cookiecutter/cookiecutter-django/pull/4991))
|
||||||
|
|
||||||
|
- Update sentry-sdk to 1.45.0 ([#4982](https://github.com/cookiecutter/cookiecutter-django/pull/4982))
|
||||||
|
|
||||||
|
- Update ruff to 0.3.7 ([#4989](https://github.com/cookiecutter/cookiecutter-django/pull/4989))
|
||||||
|
|
||||||
|
- Auto-update pre-commit hooks ([#4988](https://github.com/cookiecutter/cookiecutter-django/pull/4988))
|
||||||
|
|
||||||
## 2024.04.10
|
## 2024.04.10
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -66,13 +66,13 @@ $ source venv/bin/activate
|
||||||
|
|
||||||
These tests are slower and can be run with or without Docker:
|
These tests are slower and can be run with or without Docker:
|
||||||
|
|
||||||
- Without Docker: `scripts/test_bare.sh` (for bare metal)
|
- Without Docker: `tests/test_bare.sh` (for bare metal)
|
||||||
- With Docker: `scripts/test_docker.sh`
|
- With Docker: `tests/test_docker.sh`
|
||||||
|
|
||||||
All arguments to these scripts will be passed to the `cookiecutter` CLI, letting you set options, for example:
|
All arguments to these scripts will be passed to the `cookiecutter` CLI, letting you set options, for example:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
$ scripts/test_bare.sh use_celery=y
|
$ tests/test_bare.sh use_celery=y
|
||||||
```
|
```
|
||||||
|
|
||||||
## Submitting a pull request
|
## Submitting a pull request
|
||||||
|
|
|
@ -1755,6 +1755,13 @@ Listed in alphabetical order.
|
||||||
</td>
|
</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>quroom</td>
|
||||||
|
<td>
|
||||||
|
<a href="https://github.com/quroom">quroom</a>
|
||||||
|
</td>
|
||||||
|
<td></td>
|
||||||
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Raony Guimarães Corrêa</td>
|
<td>Raony Guimarães Corrêa</td>
|
||||||
<td>
|
<td>
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
[](https://github.com/ambv/black)
|
[](https://github.com/ambv/black)
|
||||||
|
|
||||||
[](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/)
|
[](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/)
|
||||||
[](https://discord.gg/uFXweDQc5a)
|
[](https://discord.gg/rAWFUP47d2)
|
||||||
[](https://www.codetriage.com/cookiecutter/cookiecutter-django)
|
[](https://www.codetriage.com/cookiecutter/cookiecutter-django)
|
||||||
|
|
||||||
Powered by [Cookiecutter](https://github.com/cookiecutter/cookiecutter), Cookiecutter Django is a framework for jumpstarting
|
Powered by [Cookiecutter](https://github.com/cookiecutter/cookiecutter), Cookiecutter Django is a framework for jumpstarting
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
sphinx==7.2.6
|
sphinx==7.3.7
|
||||||
sphinx-rtd-theme==2.0.0
|
sphinx-rtd-theme==2.0.0
|
||||||
myst-parser==2.0.0
|
myst-parser==3.0.1
|
||||||
|
|
|
@ -4,16 +4,16 @@ binaryornot==0.4.4
|
||||||
|
|
||||||
# Code quality
|
# Code quality
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
ruff==0.3.5
|
ruff==0.4.4
|
||||||
django-upgrade==1.16.0
|
django-upgrade==1.17.0
|
||||||
djlint==1.34.1
|
djlint==1.34.1
|
||||||
pre-commit==3.7.0
|
pre-commit==3.7.1
|
||||||
|
|
||||||
# Testing
|
# Testing
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
tox==4.14.2
|
tox==4.15.0
|
||||||
pytest==8.1.1
|
pytest==8.2.0
|
||||||
pytest-xdist==3.5.0
|
pytest-xdist==3.6.1
|
||||||
pytest-cookies==0.7.0
|
pytest-cookies==0.7.0
|
||||||
pytest-instafail==0.5.0
|
pytest-instafail==0.5.0
|
||||||
pyyaml==6.0.1
|
pyyaml==6.0.1
|
||||||
|
@ -22,5 +22,5 @@ pyyaml==6.0.1
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
PyGithub==2.3.0
|
PyGithub==2.3.0
|
||||||
gitpython==3.1.43
|
gitpython==3.1.43
|
||||||
jinja2==3.1.3
|
jinja2==3.1.4
|
||||||
requests==2.31.0
|
requests==2.31.0
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -5,7 +5,7 @@ except ImportError:
|
||||||
from distutils.core import setup
|
from distutils.core import setup
|
||||||
|
|
||||||
# We use calendar versioning
|
# We use calendar versioning
|
||||||
version = "2024.04.10"
|
version = "2024.05.11"
|
||||||
|
|
||||||
with open("README.md") as readme_file:
|
with open("README.md") as readme_file:
|
||||||
long_description = readme_file.read()
|
long_description = readme_file.read()
|
||||||
|
|
|
@ -28,14 +28,14 @@ repos:
|
||||||
exclude: '{{cookiecutter.project_slug}}/templates/'
|
exclude: '{{cookiecutter.project_slug}}/templates/'
|
||||||
|
|
||||||
- repo: https://github.com/adamchainz/django-upgrade
|
- repo: https://github.com/adamchainz/django-upgrade
|
||||||
rev: '1.16.0'
|
rev: '1.17.0'
|
||||||
hooks:
|
hooks:
|
||||||
- id: django-upgrade
|
- id: django-upgrade
|
||||||
args: ['--target-version', '4.2']
|
args: ['--target-version', '4.2']
|
||||||
|
|
||||||
# Run the Ruff linter.
|
# Run the Ruff linter.
|
||||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||||
rev: v0.3.5
|
rev: v0.4.4
|
||||||
hooks:
|
hooks:
|
||||||
# Linter
|
# Linter
|
||||||
- id: ruff
|
- id: ruff
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM docker.io/traefik:2.11.0
|
FROM docker.io/traefik:2.11.2
|
||||||
RUN mkdir -p /etc/traefik/acme \
|
RUN mkdir -p /etc/traefik/acme \
|
||||||
&& touch /etc/traefik/acme/acme.json \
|
&& touch /etc/traefik/acme/acme.json \
|
||||||
&& chmod 600 /etc/traefik/acme/acme.json
|
&& chmod 600 /etc/traefik/acme/acme.json
|
||||||
|
|
|
@ -372,6 +372,7 @@ SPECTACULAR_SETTINGS = {
|
||||||
"DESCRIPTION": "Documentation of API endpoints of {{ cookiecutter.project_name }}",
|
"DESCRIPTION": "Documentation of API endpoints of {{ cookiecutter.project_name }}",
|
||||||
"VERSION": "1.0.0",
|
"VERSION": "1.0.0",
|
||||||
"SERVE_PERMISSIONS": ["rest_framework.permissions.IsAdminUser"],
|
"SERVE_PERMISSIONS": ["rest_framework.permissions.IsAdminUser"],
|
||||||
|
"SCHEMA_PATH_PREFIX": "/api/",
|
||||||
}
|
}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if cookiecutter.frontend_pipeline == 'Webpack' %}
|
{%- if cookiecutter.frontend_pipeline == 'Webpack' %}
|
||||||
|
|
|
@ -83,6 +83,15 @@ if env("USE_DOCKER") == "yes":
|
||||||
# The node container isn't started (yet?)
|
# The node container isn't started (yet?)
|
||||||
pass
|
pass
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
{%- if cookiecutter.windows == 'y' %}
|
||||||
|
# RunServerPlus
|
||||||
|
# ------------------------------------------------------------------------------
|
||||||
|
# This is a custom setting for RunServerPlus to fix reloader issue in Windows docker environment
|
||||||
|
# Werkzeug reloader type [auto, watchdog, or stat]
|
||||||
|
RUNSERVERPLUS_POLLER_RELOADER_TYPE = 'stat'
|
||||||
|
# If you have CPU and IO load issues, you can increase this poller interval e.g) 5
|
||||||
|
RUNSERVERPLUS_POLLER_RELOADER_INTERVAL = 1
|
||||||
|
{%- endif %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
||||||
# django-extensions
|
# django-extensions
|
||||||
|
|
|
@ -43,7 +43,7 @@ urlpatterns += [
|
||||||
# API base url
|
# API base url
|
||||||
path("api/", include("config.api_router")),
|
path("api/", include("config.api_router")),
|
||||||
# DRF auth token
|
# DRF auth token
|
||||||
path("auth-token/", obtain_auth_token),
|
path("api/auth-token/", obtain_auth_token),
|
||||||
path("api/schema/", SpectacularAPIView.as_view(), name="api-schema"),
|
path("api/schema/", SpectacularAPIView.as_view(), name="api-schema"),
|
||||||
path(
|
path(
|
||||||
"api/docs/",
|
"api/docs/",
|
||||||
|
|
|
@ -102,7 +102,7 @@ services:
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: ./compose/production/nginx/Dockerfile
|
dockerfile: ./compose/production/nginx/Dockerfile
|
||||||
image: {{ cookiecutter.project_slug }}_local_nginx
|
image: {{ cookiecutter.project_slug }}_production_nginx
|
||||||
depends_on:
|
depends_on:
|
||||||
- django
|
- django
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -26,7 +26,7 @@ Changes to files in `docs/_source` will be picked up and reloaded automatically.
|
||||||
Docstrings to Documentation
|
Docstrings to Documentation
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
|
|
||||||
The sphinx extension `apidoc <https://www.sphinx-doc.org/en/master/man/sphinx-apidoc.html/>`_ is used to automatically document code using signatures and docstrings.
|
The sphinx extension `apidoc <https://www.sphinx-doc.org/en/master/man/sphinx-apidoc.html>`_ is used to automatically document code using signatures and docstrings.
|
||||||
|
|
||||||
Numpy or Google style docstrings will be picked up from project files and available for documentation. See the `Napoleon <https://sphinxcontrib-napoleon.readthedocs.io/en/latest/>`_ extension for details.
|
Numpy or Google style docstrings will be picked up from project files and available for documentation. See the `Napoleon <https://sphinxcontrib-napoleon.readthedocs.io/en/latest/>`_ extension for details.
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
"css-loader": "^6.5.1",
|
"css-loader": "^6.5.1",
|
||||||
"gulp-concat": "^2.6.1",
|
"gulp-concat": "^2.6.1",
|
||||||
"concurrently": "^8.0.1",
|
"concurrently": "^8.0.1",
|
||||||
"cssnano": "^6.0.0",
|
"cssnano": "^7.0.0",
|
||||||
"gulp": "^4.0.2",
|
"gulp": "^4.0.2",
|
||||||
"gulp-imagemin": "^7.1.0",
|
"gulp-imagemin": "^7.1.0",
|
||||||
"gulp-plumber": "^1.2.1",
|
"gulp-plumber": "^1.2.1",
|
||||||
|
|
|
@ -45,7 +45,7 @@ blank_line_after_tag = "load,extends"
|
||||||
close_void_tags = true
|
close_void_tags = true
|
||||||
format_css = true
|
format_css = true
|
||||||
format_js = true
|
format_js = true
|
||||||
# TODO: remove T002 when fixed https://github.com/Riverside-Healthcare/djLint/issues/687
|
# TODO: remove T002 when fixed https://github.com/djlint/djLint/issues/687
|
||||||
ignore = "H006,H030,H031,T002"
|
ignore = "H006,H030,H031,T002"
|
||||||
include = "H017,H035"
|
include = "H017,H035"
|
||||||
indent = 2
|
indent = 2
|
||||||
|
@ -150,11 +150,20 @@ select = [
|
||||||
ignore = [
|
ignore = [
|
||||||
"S101", # Use of assert detected https://docs.astral.sh/ruff/rules/assert/
|
"S101", # Use of assert detected https://docs.astral.sh/ruff/rules/assert/
|
||||||
"RUF012", # Mutable class attributes should be annotated with `typing.ClassVar`
|
"RUF012", # Mutable class attributes should be annotated with `typing.ClassVar`
|
||||||
"SIM102" # sometimes it's better to nest
|
"SIM102", # sometimes it's better to nest
|
||||||
|
"UP038" # Checks for uses of isinstance/issubclass that take a tuple
|
||||||
|
# of types for comparison.
|
||||||
|
# Deactivated because it can make the code slow:
|
||||||
|
# https://github.com/astral-sh/ruff/issues/7871
|
||||||
]
|
]
|
||||||
# Allow fix for all enabled rules (when `--fix`) is provided.
|
# Allow fix for all enabled rules (when `--fix`) is provided.
|
||||||
fixable = ["ALL"]
|
fixable = ["ALL"]
|
||||||
unfixable = []
|
unfixable = []
|
||||||
|
# The fixes in extend-unsafe-fixes will require
|
||||||
|
# provide the `--unsafe-fixes` flag when fixing.
|
||||||
|
extend-unsafe-fixes = [
|
||||||
|
"UP038"
|
||||||
|
]
|
||||||
# Allow unused variables when underscore-prefixed.
|
# Allow unused variables when underscore-prefixed.
|
||||||
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
|
dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
|
||||||
|
|
||||||
|
|
|
@ -11,12 +11,12 @@ argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi
|
||||||
{%- if cookiecutter.use_whitenoise == 'y' %}
|
{%- if cookiecutter.use_whitenoise == 'y' %}
|
||||||
whitenoise==6.6.0 # https://github.com/evansd/whitenoise
|
whitenoise==6.6.0 # https://github.com/evansd/whitenoise
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
redis==5.0.3 # https://github.com/redis/redis-py
|
redis==5.0.4 # https://github.com/redis/redis-py
|
||||||
{%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
|
{%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
|
||||||
hiredis==2.3.2 # https://github.com/redis/hiredis-py
|
hiredis==2.3.2 # https://github.com/redis/hiredis-py
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if cookiecutter.use_celery == "y" %}
|
{%- if cookiecutter.use_celery == "y" %}
|
||||||
celery==5.3.6 # pyup: < 6.0 # https://github.com/celery/celery
|
celery==5.4.0 # pyup: < 6.0 # https://github.com/celery/celery
|
||||||
django-celery-beat==2.6.0 # https://github.com/celery/django-celery-beat
|
django-celery-beat==2.6.0 # https://github.com/celery/django-celery-beat
|
||||||
{%- if cookiecutter.use_docker == 'y' %}
|
{%- if cookiecutter.use_docker == 'y' %}
|
||||||
flower==2.0.1 # https://github.com/mher/flower
|
flower==2.0.1 # https://github.com/mher/flower
|
||||||
|
@ -28,10 +28,10 @@ uvicorn[standard]==0.29.0 # https://github.com/encode/uvicorn
|
||||||
|
|
||||||
# Django
|
# Django
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
django==4.2.11 # pyup: < 5.0 # https://www.djangoproject.com/
|
django==4.2.13 # pyup: < 5.0 # https://www.djangoproject.com/
|
||||||
django-environ==0.11.2 # https://github.com/joke2k/django-environ
|
django-environ==0.11.2 # https://github.com/joke2k/django-environ
|
||||||
django-model-utils==4.5.0 # https://github.com/jazzband/django-model-utils
|
django-model-utils==4.5.1 # https://github.com/jazzband/django-model-utils
|
||||||
django-allauth[mfa]==0.61.1 # https://github.com/pennersr/django-allauth
|
django-allauth[mfa]==0.62.1 # https://github.com/pennersr/django-allauth
|
||||||
django-crispy-forms==2.1 # https://github.com/django-crispy-forms/django-crispy-forms
|
django-crispy-forms==2.1 # https://github.com/django-crispy-forms/django-crispy-forms
|
||||||
crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5
|
crispy-bootstrap5==2024.2 # https://github.com/django-crispy-forms/crispy-bootstrap5
|
||||||
{%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
|
{%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
Werkzeug[watchdog]==3.0.2 # https://github.com/pallets/werkzeug
|
Werkzeug[watchdog]==3.0.2 # https://github.com/pallets/werkzeug
|
||||||
ipdb==0.13.13 # https://github.com/gotcha/ipdb
|
ipdb==0.13.13 # https://github.com/gotcha/ipdb
|
||||||
{%- if cookiecutter.use_docker == 'y' %}
|
{%- if cookiecutter.use_docker == 'y' %}
|
||||||
psycopg[c]==3.1.18 # https://github.com/psycopg/psycopg
|
psycopg[c]==3.1.19 # https://github.com/psycopg/psycopg
|
||||||
{%- else %}
|
{%- else %}
|
||||||
psycopg[binary]==3.1.18 # https://github.com/psycopg/psycopg
|
psycopg[binary]==3.1.19 # https://github.com/psycopg/psycopg
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
|
{%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
|
||||||
watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles
|
watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles
|
||||||
|
@ -15,7 +15,7 @@ watchfiles==0.21.0 # https://github.com/samuelcolvin/watchfiles
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
mypy==1.7.1 # https://github.com/python/mypy
|
mypy==1.7.1 # https://github.com/python/mypy
|
||||||
django-stubs[compatible-mypy]==4.2.7 # https://github.com/typeddjango/django-stubs
|
django-stubs[compatible-mypy]==4.2.7 # https://github.com/typeddjango/django-stubs
|
||||||
pytest==8.1.1 # https://github.com/pytest-dev/pytest
|
pytest==8.2.0 # https://github.com/pytest-dev/pytest
|
||||||
pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar
|
pytest-sugar==1.0.0 # https://github.com/Frozenball/pytest-sugar
|
||||||
{%- if cookiecutter.use_drf == "y" %}
|
{%- if cookiecutter.use_drf == "y" %}
|
||||||
djangorestframework-stubs[compatible-mypy]==3.14.5 # https://github.com/typeddjango/djangorestframework-stubs
|
djangorestframework-stubs[compatible-mypy]==3.14.5 # https://github.com/typeddjango/djangorestframework-stubs
|
||||||
|
@ -23,15 +23,15 @@ djangorestframework-stubs[compatible-mypy]==3.14.5 # https://github.com/typeddj
|
||||||
|
|
||||||
# Documentation
|
# Documentation
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
sphinx==7.2.6 # https://github.com/sphinx-doc/sphinx
|
sphinx==7.3.7 # https://github.com/sphinx-doc/sphinx
|
||||||
sphinx-autobuild==2024.2.4 # https://github.com/GaretJax/sphinx-autobuild
|
sphinx-autobuild==2024.4.16 # https://github.com/GaretJax/sphinx-autobuild
|
||||||
|
|
||||||
# Code quality
|
# Code quality
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
ruff==0.3.5 # https://github.com/astral-sh/ruff
|
ruff==0.4.4 # https://github.com/astral-sh/ruff
|
||||||
coverage==7.4.4 # https://github.com/nedbat/coveragepy
|
coverage==7.5.1 # https://github.com/nedbat/coveragepy
|
||||||
djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint
|
djlint==1.34.1 # https://github.com/Riverside-Healthcare/djLint
|
||||||
pre-commit==3.7.0 # https://github.com/pre-commit/pre-commit
|
pre-commit==3.7.1 # https://github.com/pre-commit/pre-commit
|
||||||
|
|
||||||
# Django
|
# Django
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
-r base.txt
|
-r base.txt
|
||||||
|
|
||||||
gunicorn==21.2.0 # https://github.com/benoitc/gunicorn
|
gunicorn==22.0.0 # https://github.com/benoitc/gunicorn
|
||||||
psycopg[c]==3.1.18 # https://github.com/psycopg/psycopg
|
psycopg[c]==3.1.19 # https://github.com/psycopg/psycopg
|
||||||
{%- if cookiecutter.use_whitenoise == 'n' %}
|
{%- if cookiecutter.use_whitenoise == 'n' %}
|
||||||
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
|
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if cookiecutter.use_sentry == "y" %}
|
{%- if cookiecutter.use_sentry == "y" %}
|
||||||
sentry-sdk==1.44.1 # https://github.com/getsentry/sentry-python
|
sentry-sdk==2.1.1 # https://github.com/getsentry/sentry-python
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
|
{%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
|
||||||
hiredis==2.3.2 # https://github.com/redis/hiredis-py
|
hiredis==2.3.2 # https://github.com/redis/hiredis-py
|
||||||
|
@ -17,11 +17,11 @@ hiredis==2.3.2 # https://github.com/redis/hiredis-py
|
||||||
# Django
|
# Django
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
{%- if cookiecutter.cloud_provider == 'AWS' %}
|
{%- if cookiecutter.cloud_provider == 'AWS' %}
|
||||||
django-storages[s3]==1.14.2 # https://github.com/jschneier/django-storages
|
django-storages[s3]==1.14.3 # https://github.com/jschneier/django-storages
|
||||||
{%- elif cookiecutter.cloud_provider == 'GCP' %}
|
{%- elif cookiecutter.cloud_provider == 'GCP' %}
|
||||||
django-storages[google]==1.14.2 # https://github.com/jschneier/django-storages
|
django-storages[google]==1.14.3 # https://github.com/jschneier/django-storages
|
||||||
{%- elif cookiecutter.cloud_provider == 'Azure' %}
|
{%- elif cookiecutter.cloud_provider == 'Azure' %}
|
||||||
django-storages[azure]==1.14.2 # https://github.com/jschneier/django-storages
|
django-storages[azure]==1.14.3 # https://github.com/jschneier/django-storages
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- if cookiecutter.mail_service == 'Mailgun' %}
|
{%- if cookiecutter.mail_service == 'Mailgun' %}
|
||||||
django-anymail[mailgun]==10.3 # https://github.com/anymail/django-anymail
|
django-anymail[mailgun]==10.3 # https://github.com/anymail/django-anymail
|
||||||
|
|
Loading…
Reference in New Issue
Block a user