From c4291e7522648dbf43f5d38956afc061ddaf8131 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Tue, 10 Jan 2023 15:11:53 -0800 Subject: [PATCH 1/7] Add dump.rdb to gitignore (#4062) --- {{cookiecutter.project_slug}}/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore index ede26ef72..acc484307 100644 --- a/{{cookiecutter.project_slug}}/.gitignore +++ b/{{cookiecutter.project_slug}}/.gitignore @@ -326,6 +326,9 @@ Session.vim # Auto-generated tag files tags +# Redis dump file +dump.rdb + ### Project template {%- if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %} MailHog From 7b93aac85748df72cdadc0828532bb1c3ddf748b Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 11 Jan 2023 02:42:18 +0000 Subject: [PATCH 2/7] Release 2023.01.10 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75cfa9795..ecd6023af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.10 + +### Changed +- Add dump.rdb to gitignore ([#4062](https://github.com/cookiecutter/cookiecutter-django/pull/4062)) +### Fixed +- Exclude `.venv` from code style checks ([#4069](https://github.com/cookiecutter/cookiecutter-django/pull/4069)) +### Updated +- Update hiredis to 2.1.1 ([#4070](https://github.com/cookiecutter/cookiecutter-django/pull/4070)) + ## 2023.01.08 ### Updated diff --git a/setup.py b/setup.py index ff9990b7b..397500054 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.08" +version = "2023.01.10" with open("README.rst") as readme_file: long_description = readme_file.read() From 470eb70069e504940c273832dce040af843d69d4 Mon Sep 17 00:00:00 2001 From: Pamela Fox Date: Wed, 11 Jan 2023 09:38:38 -0800 Subject: [PATCH 3/7] Update Celery instructions (#4061) Co-authored-by: Bruno Alla --- docs/developing-locally.rst | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index e1c946268..2b9438059 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -141,15 +141,32 @@ In production, we have Mailgun_ configured to have your back! Celery ------ -If the project is configured to use Celery as a task scheduler then by default tasks are set to run on the main thread -when developing locally. If you have the appropriate setup on your local machine then set the following -in ``config/settings/local.py``:: +If the project is configured to use Celery as a task scheduler then, by default, tasks are set to run on the main thread when developing locally instead of getting sent to a broker. However, if you have Redis setup on your local machine, you can set the following in ``config/settings/local.py``:: CELERY_TASK_ALWAYS_EAGER = False -To run Celery locally, make sure redis-server is installed (instructions are available at https://redis.io/topics/quickstart), run the server in one terminal with `redis-server`, and then start celery in another terminal with the following command:: +Next, make sure `redis-server` is installed (per the `Getting started with Redis`_ guide) and run the server in one terminal:: - celery -A config.celery_app worker --loglevel=info + $ redis-server + +Start the Celery worker by running the following command in another terminal:: + + $ celery -A config.celery_app worker --loglevel=info + +That Celery worker should be running whenever your app is running, typically as a background process, +so that it can pick up any tasks that get queued. Learn more from the `Celery Workers Guide`_. + +The project comes with a simple task for manual testing purposes, inside `/users/tasks.py`. To queue that task locally, start the Django shell, import the task, and call `delay()` on it:: + + $ python manage.py shell + >> from .users.tasks import get_users_count + >> get_users_count.delay() + +You can also use Django admin to queue up tasks, thanks to the `django-celerybeat`_ package. + +.. _Getting started with Redis guide: https://redis.io/docs/getting-started/ +.. _Celery Workers Guide: https://docs.celeryq.dev/en/stable/userguide/workers.html +.. _django-celerybeat: https://django-celery-beat.readthedocs.io/en/latest/ Sass Compilation & Live Reloading From f690119cd99903e3db62718f4534f3fe03e57163 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 11 Jan 2023 17:18:03 -0500 Subject: [PATCH 4/7] Update tox to 4.2.7 (#4073) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bc164293d..4a604db16 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.2.6 +tox==4.2.7 pytest==7.2.0 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 541c1dce9e5abf52076e39671b930efe9c834117 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 12 Jan 2023 02:41:37 +0000 Subject: [PATCH 5/7] Release 2023.01.11 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecd6023af..2cb53128c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.11 + +### Changed +- Update Celery instructions in the documentation ([#4061](https://github.com/cookiecutter/cookiecutter-django/pull/4061)) +### Updated +- Update tox to 4.2.7 ([#4073](https://github.com/cookiecutter/cookiecutter-django/pull/4073)) + ## 2023.01.10 ### Changed diff --git a/setup.py b/setup.py index 397500054..5b1bc3b26 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.10" +version = "2023.01.11" with open("README.rst") as readme_file: long_description = readme_file.read() From fe6e6e85cbcd6dbb78d3427a6c971a74fecd5223 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 12 Jan 2023 13:28:26 -0500 Subject: [PATCH 6/7] Update sentry-sdk to 1.13.0 (#4074) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index ce3e9f3fe..fd449d1fe 100644 --- 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.12.1 # https://github.com/getsentry/sentry-python +sentry-sdk==1.13.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.1.1 # https://github.com/redis/hiredis-py From f50a2a5b0f5d9aa03a815be0e0c577f40983e67c Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 13 Jan 2023 02:46:24 +0000 Subject: [PATCH 7/7] Release 2023.01.12 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cb53128c..5269ac14d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.12 + +### Updated +- Update sentry-sdk to 1.13.0 ([#4074](https://github.com/cookiecutter/cookiecutter-django/pull/4074)) + ## 2023.01.11 ### Changed diff --git a/setup.py b/setup.py index 5b1bc3b26..765459067 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.01.11" +version = "2023.01.12" with open("README.rst") as readme_file: long_description = readme_file.read()