Merge branch 'master' into chore/minor-refactor

2025-08-15 17:34:52 +03:00 · 2022-11-22 22:46:51 +00:00 · 2022-11-22 22:46:51 +00:00 · b30bd8ae81
commit b30bd8ae81
parent 9f70cde194 a78b052bcc
16 changed files with 116 additions and 20 deletions
--- a/.github/contributors.json
+++ b/.github/contributors.json
@ -1297,5 +1297,20 @@
    "name": "krati yadav",
    "github_login": "krati5",
    "twitter_username": ""
+  },
+  {
+    "name": "Abe Hanoka",
+    "github_login": "abe-101",
+    "twitter_username": "abe__101"
+  },
+  {
+    "name": "Adin Hodovic",
+    "github_login": "adinhodovic",
+    "twitter_username": ""
+  },
+  {
+    "name": "Leifur Halldor Asgeirsson",
+    "github_login": "leifurhauks",
+    "twitter_username": ""
  }
 ]
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -9,7 +9,7 @@ repos:
      - id: check-yaml

  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.0
+    rev: v3.2.2
    hooks:
      - id: pyupgrade
        args: [--py310-plus]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,6 +3,42 @@ All enhancements and patches to Cookiecutter Django will be documented in this f

 <!-- GENERATOR_PLACEHOLDER -->

+## 2022.11.11
+
+### Updated
+- Auto-update pre-commit hooks ([#3942](https://github.com/cookiecutter/cookiecutter-django/pull/3942))
+
+## 2022.11.07
+
+### Updated
+- Update watchfiles to 0.18.1 ([#3938](https://github.com/cookiecutter/cookiecutter-django/pull/3938))
+
+## 2022.11.06
+
+### Changed
+- Store extended Celery task attributes in backend ([#3855](https://github.com/cookiecutter/cookiecutter-django/pull/3855))
+- add os requirements for Ubuntu 22.04 (Jammy) ([#3930](https://github.com/cookiecutter/cookiecutter-django/pull/3930))
+### Updated
+- Update pytest-sugar to 0.9.6 ([#3937](https://github.com/cookiecutter/cookiecutter-django/pull/3937))
+- Update pygithub to 1.57 ([#3936](https://github.com/cookiecutter/cookiecutter-django/pull/3936))
+- Update sphinx-rtd-theme to 1.1.1 ([#3935](https://github.com/cookiecutter/cookiecutter-django/pull/3935))
+
+## 2022.11.02
+
+### Changed
+- fix typo in CONTRIBUTING.md ([#3932](https://github.com/cookiecutter/cookiecutter-django/pull/3932))
+### Updated
+- Update crispy-bootstrap5 to 0.7 ([#3886](https://github.com/cookiecutter/cookiecutter-django/pull/3886))
+- Update django-coverage-plugin to 2.0.4 ([#3927](https://github.com/cookiecutter/cookiecutter-django/pull/3927))
+- Update pytz to 2022.6 ([#3928](https://github.com/cookiecutter/cookiecutter-django/pull/3928))
+- Update sphinx-rtd-theme to 1.1.0 ([#3929](https://github.com/cookiecutter/cookiecutter-django/pull/3929))
+- Update pillow to 9.3.0 ([#3922](https://github.com/cookiecutter/cookiecutter-django/pull/3922))
+
+## 2022.10.30
+
+### Updated
+- Auto-update pre-commit hooks ([#3924](https://github.com/cookiecutter/cookiecutter-django/pull/3924))
+
 ## 2022.10.28

 ### Updated
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -35,7 +35,7 @@ is:

    $ tox -e py310

-This will run pytest with the python3.9 interpreter, for example.
+This will run pytest with the python3.10 interpreter, for example.

 To run a particular test with tox for against your current Python version:

--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -138,6 +138,13 @@ Listed in alphabetical order.
    </td>
    <td>abdadeel_</td>
  </tr>
+  <tr>
+    <td>Abe Hanoka</td>
+    <td>
+      <a href="https://github.com/abe-101">abe-101</a>
+    </td>
+    <td>abe__101</td>
+  </tr>
  <tr>
    <td>Adam Bogdał</td>
    <td>
@ -159,6 +166,13 @@ Listed in alphabetical order.
    </td>
    <td></td>
  </tr>
+  <tr>
+    <td>Adin Hodovic</td>
+    <td>
+      <a href="https://github.com/adinhodovic">adinhodovic</a>
+    </td>
+    <td></td>
+  </tr>
  <tr>
    <td>Agam Dua</td>
    <td>
@ -1146,6 +1160,13 @@ Listed in alphabetical order.
    </td>
    <td></td>
  </tr>
+  <tr>
+    <td>Leifur Halldor Asgeirsson</td>
+    <td>
+      <a href="https://github.com/leifurhauks">leifurhauks</a>
+    </td>
+    <td></td>
+  </tr>
  <tr>
    <td>Leo won</td>
    <td>
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@ -1,2 +1,2 @@
 sphinx==5.3.0
-sphinx-rtd-theme==1.0.0
+sphinx-rtd-theme==1.1.1
--- a/requirements.txt
+++ b/requirements.txt
@ -12,7 +12,7 @@ pre-commit==2.20.0

 # Testing
 # ------------------------------------------------------------------------------
-tox==3.27.0
+tox==3.27.1
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
@ -20,7 +20,7 @@ pyyaml==6.0

 # Scripting
 # ------------------------------------------------------------------------------
-PyGithub==1.56
+PyGithub==1.57
 gitpython==3.1.29
 jinja2==3.1.2
 requests==2.28.1
--- a/setup.py
+++ b/setup.py
@ -5,7 +5,7 @@ except ImportError:
    from distutils.core import setup

 # We use calendar versioning
-version = "2022.10.28"
+version = "2022.11.11"

 with open("README.rst") as readme_file:
    long_description = readme_file.read()
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@ -10,7 +10,7 @@ repos:
      - id: check-yaml

  - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.0
+    rev: v3.2.2
    hooks:
      - id: pyupgrade
        args: [--py310-plus]
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@ -283,6 +283,8 @@ if USE_TZ:
 CELERY_BROKER_URL = env("CELERY_BROKER_URL")
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-result_backend
 CELERY_RESULT_BACKEND = CELERY_BROKER_URL
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-extended
+CELERY_RESULT_EXTENDED = True
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-accept_content
 CELERY_ACCEPT_CONTENT = ["json"]
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-task_serializer
@ -297,6 +299,8 @@ CELERY_TASK_TIME_LIMIT = 5 * 60
 CELERY_TASK_SOFT_TIME_LIMIT = 60
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#beat-scheduler
 CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler"
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#worker-send-task-events
+CELERY_WORKER_SEND_TASK_EVENTS = True

 {%- endif %}
 # django-allauth
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@ -11,7 +11,6 @@ services:
      dockerfile: ./compose/local/django/Dockerfile
    image: {{ cookiecutter.project_slug }}_local_django
    container_name: {{ cookiecutter.project_slug }}_local_django
-    platform: linux/x86_64
    depends_on:
      - postgres
      {%- if cookiecutter.use_celery == 'y' %}
@ -44,7 +43,6 @@ services:
  docs:
    image: {{ cookiecutter.project_slug }}_local_docs
    container_name: {{ cookiecutter.project_slug }}_local_docs
-    platform: linux/x86_64
    build:
      context: .
      dockerfile: ./compose/local/docs/Dockerfile
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@ -11,7 +11,6 @@ services:
      context: .
      dockerfile: ./compose/production/django/Dockerfile
    image: {{ cookiecutter.project_slug }}_production_django
-    platform: linux/x86_64
    depends_on:
      - postgres
      - redis
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@ -1,6 +1,6 @@
-pytz==2022.5  # https://github.com/stub42/pytz
-python-slugify==6.1.2  # https://github.com/un33k/python-slugify
-Pillow==9.2.0  # https://github.com/python-pillow/Pillow
+pytz==2022.6  # https://github.com/stub42/pytz
+python-slugify==7.0.0  # https://github.com/un33k/python-slugify
+Pillow==9.3.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.1.0 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin
@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.2.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.3.4  # https://github.com/redis/redis-py
+redis==4.3.5  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
@ -24,7 +24,7 @@ flower==1.2.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.19.0  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.20.0  # https://github.com/encode/uvicorn
 {%- endif %}

 # Django
@ -34,7 +34,7 @@ django-environ==0.9.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.51.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
-crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
+crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 django-compressor==4.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@ -8,7 +8,7 @@ psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
 psycopg2-binary==2.9.5  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
-watchfiles==0.18.0  # https://github.com/samuelcolvin/watchfiles
+watchfiles==0.18.1  # https://github.com/samuelcolvin/watchfiles
 {%- endif %}

 # Testing
@ -16,7 +16,7 @@ watchfiles==0.18.0  # https://github.com/samuelcolvin/watchfiles
 mypy==0.982  # https://github.com/python/mypy
 django-stubs==1.12.0  # https://github.com/typeddjango/django-stubs
 pytest==7.2.0  # https://github.com/pytest-dev/pytest
-pytest-sugar==0.9.5  # https://github.com/Frozenball/pytest-sugar
+pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestframework-stubs
 {%- endif %}
@ -44,5 +44,5 @@ factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy

 django-debug-toolbar==3.7.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.2.1  # https://github.com/django-extensions/django-extensions
-django-coverage-plugin==2.0.3  # https://github.com/nedbat/django_coverage_plugin
+django-coverage-plugin==2.0.4  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@ -8,7 +8,7 @@ psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.10.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.11.1  # 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
--- a/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt
+++ b/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt
@ -0,0 +1,23 @@
+##basic build dependencies of various Django apps for Ubuntu Jammy 22.04
+#build-essential metapackage install: make, gcc, g++,
+build-essential
+#required to translate
+gettext
+python3-dev
+
+##shared dependencies of:
+##Pillow, pylibmc
+zlib1g-dev
+
+##Postgresql and psycopg2 dependencies
+libpq-dev
+
+##Pillow dependencies
+libtiff5-dev
+libjpeg8-dev
+libfreetype6-dev
+liblcms2-dev
+libwebp-dev
+
+##django-extensions
+graphviz-dev