mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2024-11-10 19:57:09 +03:00
Merge branch 'master' into bootstrap5
This commit is contained in:
commit
72208dc79e
5
.github/contributors.json
vendored
5
.github/contributors.json
vendored
|
@ -1137,5 +1137,10 @@
|
|||
"name": "Floyd Hightower",
|
||||
"github_login": "fhightower",
|
||||
"twitter_username": ""
|
||||
},
|
||||
{
|
||||
"name": "Manjit Pardeshi",
|
||||
"github_login": "Manjit2003",
|
||||
"twitter_username": ""
|
||||
}
|
||||
]
|
2
.github/workflows/update-changelog.yml
vendored
2
.github/workflows/update-changelog.yml
vendored
|
@ -28,7 +28,7 @@ jobs:
|
|||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Commit changes
|
||||
uses: stefanzweifel/git-auto-commit-action@v4.11.0
|
||||
uses: stefanzweifel/git-auto-commit-action@v4.12.0
|
||||
with:
|
||||
commit_message: Update Changelog
|
||||
file_pattern: CHANGELOG.md
|
||||
|
|
2
.github/workflows/update-contributors.yml
vendored
2
.github/workflows/update-contributors.yml
vendored
|
@ -24,7 +24,7 @@ jobs:
|
|||
run: python scripts/update_contributors.py
|
||||
|
||||
- name: Commit changes
|
||||
uses: stefanzweifel/git-auto-commit-action@v4.11.0
|
||||
uses: stefanzweifel/git-auto-commit-action@v4.12.0
|
||||
with:
|
||||
commit_message: Update Contributors
|
||||
file_pattern: CONTRIBUTORS.md .github/contributors.json
|
||||
|
|
51
CHANGELOG.md
51
CHANGELOG.md
|
@ -3,6 +3,57 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
|
|||
|
||||
<!-- GENERATOR_PLACEHOLDER -->
|
||||
|
||||
## [2021-09-30]
|
||||
### Updated
|
||||
- Update sentry-sdk to 1.4.3 ([#3334](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3334))
|
||||
|
||||
## [2021-09-29]
|
||||
### Updated
|
||||
- Update django-cors-headers to 3.9.0 ([#3332](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3332))
|
||||
|
||||
## [2021-09-27]
|
||||
### Updated
|
||||
- Update sentry-sdk to 1.4.2 ([#3329](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3329))
|
||||
|
||||
## [2021-09-26]
|
||||
### Updated
|
||||
- Update django-crispy-forms to 1.13.0 ([#3327](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3327))
|
||||
|
||||
## [2021-09-24]
|
||||
### Changed
|
||||
- Add django-settings-module to .pylintrc ([#3326](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3326))
|
||||
|
||||
## [2021-09-23]
|
||||
### Updated
|
||||
- Update sentry-sdk to 1.4.1 ([#3325](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3325))
|
||||
|
||||
## [2021-09-22]
|
||||
### Updated
|
||||
- Update sentry-sdk to 1.4.0 ([#3324](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3324))
|
||||
|
||||
## [2021-09-16]
|
||||
### Updated
|
||||
- Update tox to 3.24.4 ([#3323](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3323))
|
||||
|
||||
## [2021-09-15]
|
||||
### Updated
|
||||
- Auto-update pre-commit hooks ([#3322](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3322))
|
||||
|
||||
## [2021-09-14]
|
||||
### Updated
|
||||
- Update black to 21.9b0 ([#3321](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3321))
|
||||
|
||||
## [2021-09-13]
|
||||
### Updated
|
||||
- Bump stefanzweifel/git-auto-commit-action from 4.11.0 to 4.12.0 ([#3320](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3320))
|
||||
- Update sphinx to 4.2.0 ([#3319](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3319))
|
||||
|
||||
## [2021-09-11]
|
||||
### Changed
|
||||
- Removing pycharm docs if app does not use pycharm ([#3139](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3139))
|
||||
### Updated
|
||||
- Update django-environ to 0.7.0 ([#3317](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3317))
|
||||
|
||||
## [2021-09-06]
|
||||
### Changed
|
||||
- Update Celery to v5 ([#3280](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3280))
|
||||
|
|
|
@ -1104,6 +1104,13 @@ Listed in alphabetical order.
|
|||
</td>
|
||||
<td>flyudvik</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Manjit Pardeshi</td>
|
||||
<td>
|
||||
<a href="https://github.com/Manjit2003">Manjit2003</a>
|
||||
</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Martin Blech</td>
|
||||
<td>
|
||||
|
|
|
@ -4,7 +4,7 @@ binaryornot==0.4.4
|
|||
|
||||
# Code quality
|
||||
# ------------------------------------------------------------------------------
|
||||
black==21.8b0
|
||||
black==21.9b0
|
||||
isort==5.9.3
|
||||
flake8==3.9.2
|
||||
flake8-isort==4.0.0
|
||||
|
@ -12,7 +12,7 @@ pre-commit==2.15.0
|
|||
|
||||
# Testing
|
||||
# ------------------------------------------------------------------------------
|
||||
tox==3.24.3
|
||||
tox==3.24.4
|
||||
pytest==6.2.5
|
||||
pytest-cookies==0.6.1
|
||||
pytest-instafail==0.4.2
|
||||
|
|
|
@ -11,7 +11,7 @@ repos:
|
|||
- id: check-yaml
|
||||
|
||||
- repo: https://github.com/psf/black
|
||||
rev: 21.8b0
|
||||
rev: 21.9b0
|
||||
hooks:
|
||||
- id: black
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[MASTER]
|
||||
load-plugins=pylint_django{% if cookiecutter.use_celery == "y" %}, pylint_celery{% endif %}
|
||||
|
||||
django-settings-module=config.settings.base
|
||||
[FORMAT]
|
||||
max-line-length=120
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ django==3.1.13 # pyup: < 3.2 # https://www.djangoproject.com/
|
|||
django-environ==0.7.0 # https://github.com/joke2k/django-environ
|
||||
django-model-utils==4.1.1 # https://github.com/jazzband/django-model-utils
|
||||
django-allauth==0.45.0 # https://github.com/pennersr/django-allauth
|
||||
django-crispy-forms==1.12.0 # https://github.com/django-crispy-forms/django-crispy-forms
|
||||
django-crispy-forms==1.13.0 # https://github.com/django-crispy-forms/django-crispy-forms
|
||||
crispy-bootstrap5==0.5 # https://github.com/django-crispy-forms/crispy-bootstrap5
|
||||
{%- if cookiecutter.use_compressor == "y" %}
|
||||
django-compressor==2.4.1 # https://github.com/django-compressor/django-compressor
|
||||
|
@ -42,5 +42,5 @@ django-redis==5.0.0 # https://github.com/jazzband/django-redis
|
|||
{%- if cookiecutter.use_drf == "y" %}
|
||||
# Django REST Framework
|
||||
djangorestframework==3.12.4 # https://github.com/encode/django-rest-framework
|
||||
django-cors-headers==3.8.0 # https://github.com/adamchainz/django-cors-headers
|
||||
django-cors-headers==3.9.0 # https://github.com/adamchainz/django-cors-headers
|
||||
{%- endif %}
|
||||
|
|
|
@ -20,7 +20,7 @@ pytest-sugar==0.9.4 # https://github.com/Frozenball/pytest-sugar
|
|||
|
||||
# Documentation
|
||||
# ------------------------------------------------------------------------------
|
||||
sphinx==4.1.2 # https://github.com/sphinx-doc/sphinx
|
||||
sphinx==4.2.0 # https://github.com/sphinx-doc/sphinx
|
||||
sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
|
||||
|
||||
# Code quality
|
||||
|
@ -28,7 +28,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
|
|||
flake8==3.9.2 # https://github.com/PyCQA/flake8
|
||||
flake8-isort==4.0.0 # https://github.com/gforcada/flake8-isort
|
||||
coverage==5.5 # https://github.com/nedbat/coveragepy
|
||||
black==21.8b0 # https://github.com/psf/black
|
||||
black==21.9b0 # https://github.com/psf/black
|
||||
pylint-django==2.4.4 # https://github.com/PyCQA/pylint-django
|
||||
{%- if cookiecutter.use_celery == 'y' %}
|
||||
pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery
|
||||
|
|
|
@ -8,7 +8,7 @@ psycopg2==2.9.1 # https://github.com/psycopg/psycopg2
|
|||
Collectfast==2.2.0 # https://github.com/antonagestam/collectfast
|
||||
{%- endif %}
|
||||
{%- if cookiecutter.use_sentry == "y" %}
|
||||
sentry-sdk==1.3.1 # https://github.com/getsentry/sentry-python
|
||||
sentry-sdk==1.4.3 # https://github.com/getsentry/sentry-python
|
||||
{%- endif %}
|
||||
{%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
|
||||
hiredis==2.0.0 # https://github.com/redis/hiredis-py
|
||||
|
|
|
@ -1 +1 @@
|
|||
python-3.9.4
|
||||
python-3.9.7
|
||||
|
|
Loading…
Reference in New Issue
Block a user