From f4ab7bf671221195e5cd7241f2b551beff40594a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 19 Jan 2023 18:10:06 -0500 Subject: [PATCH 01/24] Update tox to 4.3.5 (#4087) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5dc9d97ab..6d0f15b64 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==2.21.0 # Testing # ------------------------------------------------------------------------------ -tox==4.3.3 +tox==4.3.5 pytest==7.2.1 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 502d978e222f25f73f294067c5e4b0e655c04e73 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 19 Jan 2023 18:54:31 -0500 Subject: [PATCH 02/24] Update requests from 2.28.1 to 2.28.2 (#4090) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6d0f15b64..add5fb030 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,4 +23,4 @@ pyyaml==6.0 PyGithub==1.57 gitpython==3.1.30 jinja2==3.1.2 -requests==2.28.1 +requests==2.28.2 From 4576c70a5d902e9495fd58f5cd91f2badd7070e1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 19 Jan 2023 18:55:31 -0500 Subject: [PATCH 03/24] Update redis from 4.4.1 to 4.4.2 (#4091) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 38f8daabf..6c29d5d2d 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -12,7 +12,7 @@ argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.3.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.4.1 # https://github.com/redis/redis-py +redis==4.4.2 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.1.1 # https://github.com/redis/hiredis-py {%- endif %} From c5b0db3c635ffaf2d601c536cf3be0f5016dc4e3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 19 Jan 2023 18:56:01 -0500 Subject: [PATCH 04/24] Update coverage from 7.0.4 to 7.0.5 (#4092) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 89abc0a0e..6560033ef 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort -coverage==7.0.4 # https://github.com/nedbat/coveragepy +coverage==7.0.5 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From e5db124479b1004e339555a746c60489213812ac Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 20 Jan 2023 02:28:57 +0000 Subject: [PATCH 05/24] Release 2023.01.19 --- CHANGELOG.md | 10 ++++++++++ setup.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 344978d0a..c383e84f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.19 + +### Fixed +- Add sourcemaps support to Gulp ([#4089](https://github.com/cookiecutter/cookiecutter-django/pull/4089)) +### Updated +- Update coverage to 7.0.5 ([#4092](https://github.com/cookiecutter/cookiecutter-django/pull/4092)) +- Update redis to 4.4.2 ([#4091](https://github.com/cookiecutter/cookiecutter-django/pull/4091)) +- Update requests to 2.28.2 ([#4090](https://github.com/cookiecutter/cookiecutter-django/pull/4090)) +- Update tox to 4.3.5 ([#4087](https://github.com/cookiecutter/cookiecutter-django/pull/4087)) + ## 2023.01.17 ### Updated diff --git a/setup.py b/setup.py index 1b0f44843..53c2d0709 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.17" +version = "2023.01.19" with open("README.rst") as readme_file: long_description = readme_file.read() From 403298fcdcfbef64b897a4f9d0d3e23d4605fe7c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 21 Jan 2023 11:55:33 -0500 Subject: [PATCH 06/24] Update django-stubs from 1.13.1 to 1.13.2 (#4093) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 6560033ef..7436d32b9 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==0.982 # https://github.com/python/mypy -django-stubs==1.13.1 # https://github.com/typeddjango/django-stubs +django-stubs==1.13.2 # https://github.com/typeddjango/django-stubs pytest==7.2.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} From 4d087f98be29dd95832fd693411ea339413eecf1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 22 Jan 2023 02:28:22 +0000 Subject: [PATCH 07/24] Release 2023.01.21 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c383e84f5..6f347395a 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.21 + +### Updated +- Update django-stubs to 1.13.2 ([#4093](https://github.com/cookiecutter/cookiecutter-django/pull/4093)) + ## 2023.01.19 ### Fixed diff --git a/setup.py b/setup.py index 53c2d0709..d1e91c223 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.19" +version = "2023.01.21" with open("README.rst") as readme_file: long_description = readme_file.read() From 6a601208ea30e2d1d9c5188d08bc4ff4567a0de3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 22 Jan 2023 09:54:59 -0500 Subject: [PATCH 08/24] Update django-compressor from 4.3 to 4.3.1 (#4094) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 6c29d5d2d..b695d5af8 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -36,7 +36,7 @@ django-allauth==0.52.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.7 # https://github.com/django-crispy-forms/crispy-bootstrap5 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %} -django-compressor==4.3 # https://github.com/django-compressor/django-compressor +django-compressor==4.3.1 # https://github.com/django-compressor/django-compressor {%- endif %} django-redis==5.2.0 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == 'y' %} From ca18b6dc7c58b04b1dc3270e29132109e6c46fe6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 23 Jan 2023 02:25:09 +0000 Subject: [PATCH 09/24] Release 2023.01.22 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f347395a..494a67075 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.22 + +### Updated +- Update django-compressor to 4.3.1 ([#4094](https://github.com/cookiecutter/cookiecutter-django/pull/4094)) + ## 2023.01.21 ### Updated diff --git a/setup.py b/setup.py index d1e91c223..17ef3ffe5 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.21" +version = "2023.01.22" with open("README.rst") as readme_file: long_description = readme_file.read() From e2a7647d3c2327dc4335358ba7a315de5c4d6c18 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 23 Jan 2023 12:21:21 -0500 Subject: [PATCH 10/24] Update sentry-sdk to 1.14.0 (#4096) --- {{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 fd449d1fe..6936adffd 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.13.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.14.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 0cd6a66a262d26c4c84aeb3cc49de2e8a35b331f Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 24 Jan 2023 02:23:48 +0000 Subject: [PATCH 11/24] Release 2023.01.23 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 494a67075..a2187d744 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.23 + +### Updated +- Update sentry-sdk to 1.14.0 ([#4096](https://github.com/cookiecutter/cookiecutter-django/pull/4096)) + ## 2023.01.22 ### Updated diff --git a/setup.py b/setup.py index 17ef3ffe5..20df0c815 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.22" +version = "2023.01.23" with open("README.rst") as readme_file: long_description = readme_file.read() From 3361c75fbcf3305cd00bf4790838a5a75a215b97 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 24 Jan 2023 05:43:45 -0500 Subject: [PATCH 12/24] Update pre-commit to 3.0.0 (#4098) * Update pre-commit from 2.21.0 to 3.0.0 * Update pre-commit from 2.21.0 to 3.0.0 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index add5fb030..44e403020 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==22.12.0 isort==5.11.4 flake8==6.0.0 flake8-isort==6.0.0 -pre-commit==2.21.0 +pre-commit==3.0.0 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 7436d32b9..782846f82 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -36,7 +36,7 @@ pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==2.21.0 # https://github.com/pre-commit/pre-commit +pre-commit==3.0.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 030b00177a98359ff4e81049ee05d6ca7aad67f9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 25 Jan 2023 02:24:52 +0000 Subject: [PATCH 13/24] Release 2023.01.24 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2187d744..32cb28daa 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.24 + +### Updated +- Update pre-commit to 3.0.0 ([#4098](https://github.com/cookiecutter/cookiecutter-django/pull/4098)) + ## 2023.01.23 ### Updated diff --git a/setup.py b/setup.py index 20df0c815..0453c33ba 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.23" +version = "2023.01.24" with open("README.rst") as readme_file: long_description = readme_file.read() From 2dc964a8e3feb443b7c19a99ecd174e1b9230adf Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 25 Jan 2023 03:50:58 -0500 Subject: [PATCH 14/24] Update coverage from 7.0.5 to 7.1.0 (#4100) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 782846f82..447104dae 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # ------------------------------------------------------------------------------ flake8==6.0.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort -coverage==7.0.5 # https://github.com/nedbat/coveragepy +coverage==7.1.0 # https://github.com/nedbat/coveragepy black==22.12.0 # https://github.com/psf/black pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From dfd8164ef82512e7ee62f5954a78af93fc72bc18 Mon Sep 17 00:00:00 2001 From: Patrick Tran Date: Wed, 25 Jan 2023 04:50:41 -0800 Subject: [PATCH 15/24] Update postgres and redis to point to mini tiers (#4099) * Update postgres and redis to point to mini tiers * Update deployment-on-heroku.rst * Update deployment-on-heroku.rst --- docs/deployment-on-heroku.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst index e239b6593..71fb45dda 100644 --- a/docs/deployment-on-heroku.rst +++ b/docs/deployment-on-heroku.rst @@ -12,13 +12,13 @@ Run these commands to deploy the project to Heroku: heroku create --buildpack heroku/python - heroku addons:create heroku-postgresql:hobby-dev + heroku addons:create heroku-postgresql:mini # On Windows use double quotes for the time zone, e.g. # heroku pg:backups schedule --at "02:00 America/Los_Angeles" DATABASE_URL heroku pg:backups schedule --at '02:00 America/Los_Angeles' DATABASE_URL heroku pg:promote DATABASE_URL - heroku addons:create heroku-redis:hobby-dev + heroku addons:create heroku-redis:mini # Assuming you chose Mailgun as mail service (see below for others) heroku addons:create mailgun:starter @@ -125,4 +125,4 @@ which runs Gulp in cookiecutter-django. If things don't work, please refer to the Heroku docs. -.. _multiple buildpacks: https://devcenter.heroku.com/articles/using-multiple-buildpacks-for-an-app \ No newline at end of file +.. _multiple buildpacks: https://devcenter.heroku.com/articles/using-multiple-buildpacks-for-an-app From cb99f0d2115df1df2deb8716e79e6611309a10bd Mon Sep 17 00:00:00 2001 From: luzfcb Date: Wed, 25 Jan 2023 12:51:16 +0000 Subject: [PATCH 16/24] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 34c84979d..9d60e5da1 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1347,5 +1347,10 @@ "name": "Robin", "github_login": "Kaffeetasse", "twitter_username": "" + }, + { + "name": "Patrick Tran", + "github_login": "theptrk", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 718d58c57..3d85b68ac 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1475,6 +1475,13 @@ Listed in alphabetical order. + + Patrick Tran + + theptrk + + + Pawan Chaurasia From 70014c2b45b5f794a4fd4c82cb73ad52255d17ce Mon Sep 17 00:00:00 2001 From: tildebox <61698441+tildebox@users.noreply.github.com> Date: Wed, 25 Jan 2023 23:55:08 +0100 Subject: [PATCH 17/24] Rename ROOT_DIR to BASE_DIR (#4086) Co-authored-by: example Fix https://github.com/cookiecutter/cookiecutter-django/issues/4075 --- tests/test_cookiecutter_generation.py | 4 ++-- {{cookiecutter.project_slug}}/config/asgi.py | 4 ++-- {{cookiecutter.project_slug}}/config/settings/base.py | 10 +++++----- {{cookiecutter.project_slug}}/config/wsgi.py | 4 ++-- .../merge_production_dotenvs_in_dotenv.py | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 6219f75ef..3a881cc64 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -134,11 +134,11 @@ def _fixture_id(ctx): return "-".join(f"{key}:{value}" for key, value in ctx.items()) -def build_files_list(root_dir): +def build_files_list(base_dir): """Build a list containing absolute paths to the generated files.""" return [ os.path.join(dirpath, file_path) - for dirpath, subdirs, files in os.walk(root_dir) + for dirpath, subdirs, files in os.walk(base_dir) for file_path in files ] diff --git a/{{cookiecutter.project_slug}}/config/asgi.py b/{{cookiecutter.project_slug}}/config/asgi.py index 8c99bbf53..65e76ca0a 100644 --- a/{{cookiecutter.project_slug}}/config/asgi.py +++ b/{{cookiecutter.project_slug}}/config/asgi.py @@ -15,8 +15,8 @@ from django.core.asgi import get_asgi_application # This allows easy placement of apps within the interior # {{ cookiecutter.project_slug }} directory. -ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent -sys.path.append(str(ROOT_DIR / "{{ cookiecutter.project_slug }}")) +BASE_DIR = Path(__file__).resolve(strict=True).parent.parent +sys.path.append(str(BASE_DIR / "{{ cookiecutter.project_slug }}")) # If DJANGO_SETTINGS_MODULE is unset, default to the local settings os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local") diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 6bf6a6e5c..44b03fa03 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -5,15 +5,15 @@ from pathlib import Path import environ -ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent.parent +BASE_DIR = Path(__file__).resolve(strict=True).parent.parent.parent # {{ cookiecutter.project_slug }}/ -APPS_DIR = ROOT_DIR / "{{ cookiecutter.project_slug }}" +APPS_DIR = BASE_DIR / "{{ cookiecutter.project_slug }}" env = environ.Env() READ_DOT_ENV_FILE = env.bool("DJANGO_READ_DOT_ENV_FILE", default=False) if READ_DOT_ENV_FILE: # OS environment variables take precedence over variables from .env - env.read_env(str(ROOT_DIR / ".env")) + env.read_env(str(BASE_DIR / ".env")) # GENERAL # ------------------------------------------------------------------------------ @@ -33,7 +33,7 @@ USE_I18N = True # https://docs.djangoproject.com/en/dev/ref/settings/#use-tz USE_TZ = True # https://docs.djangoproject.com/en/dev/ref/settings/#locale-paths -LOCALE_PATHS = [str(ROOT_DIR / "locale")] +LOCALE_PATHS = [str(BASE_DIR / "locale")] # DATABASES # ------------------------------------------------------------------------------ @@ -159,7 +159,7 @@ MIDDLEWARE = [ # STATIC # ------------------------------------------------------------------------------ # https://docs.djangoproject.com/en/dev/ref/settings/#static-root -STATIC_ROOT = str(ROOT_DIR / "staticfiles") +STATIC_ROOT = str(BASE_DIR / "staticfiles") # https://docs.djangoproject.com/en/dev/ref/settings/#static-url STATIC_URL = "/static/" # https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS diff --git a/{{cookiecutter.project_slug}}/config/wsgi.py b/{{cookiecutter.project_slug}}/config/wsgi.py index a7de581ca..3fd809ef3 100644 --- a/{{cookiecutter.project_slug}}/config/wsgi.py +++ b/{{cookiecutter.project_slug}}/config/wsgi.py @@ -21,8 +21,8 @@ from django.core.wsgi import get_wsgi_application # This allows easy placement of apps within the interior # {{ cookiecutter.project_slug }} directory. -ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent -sys.path.append(str(ROOT_DIR / "{{ cookiecutter.project_slug }}")) +BASE_DIR = Path(__file__).resolve(strict=True).parent.parent +sys.path.append(str(BASE_DIR / "{{ cookiecutter.project_slug }}")) # We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks # if running multiple sites in the same mod_wsgi process. To fix this, use # mod_wsgi daemon mode with each site in its own daemon process, or use diff --git a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py index d702a5f67..e5f82504a 100644 --- a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py +++ b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py @@ -4,13 +4,13 @@ from pathlib import Path import pytest -ROOT_DIR_PATH = Path(__file__).parent.resolve() -PRODUCTION_DOTENVS_DIR_PATH = ROOT_DIR_PATH / ".envs" / ".production" +BASE_DIR_PATH = Path(__file__).parent.resolve() +PRODUCTION_DOTENVS_DIR_PATH = BASE_DIR_PATH / ".envs" / ".production" PRODUCTION_DOTENV_FILE_PATHS = [ PRODUCTION_DOTENVS_DIR_PATH / ".django", PRODUCTION_DOTENVS_DIR_PATH / ".postgres", ] -DOTENV_FILE_PATH = ROOT_DIR_PATH / ".env" +DOTENV_FILE_PATH = BASE_DIR_PATH / ".env" def merge( From 56f6ba922d8c3f3151f2e2a6b6b430706e958181 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 25 Jan 2023 23:40:00 +0000 Subject: [PATCH 18/24] Update Contributors --- .github/contributors.json | 5 +++++ CONTRIBUTORS.md | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/.github/contributors.json b/.github/contributors.json index 9d60e5da1..0f923e027 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1352,5 +1352,10 @@ "name": "Patrick Tran", "github_login": "theptrk", "twitter_username": "" + }, + { + "name": "tildebox", + "github_login": "tildebox", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 3d85b68ac..57194bca3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1741,6 +1741,13 @@ Listed in alphabetical order. + + tildebox + + tildebox + + + Tim Claessens From ef461f9231a4509175d2ef510fb40dd7ec840883 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 26 Jan 2023 02:25:13 +0000 Subject: [PATCH 19/24] Release 2023.01.25 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32cb28daa..5b1b47b52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.25 + +### Changed +- Rename ROOT_DIR to BASE_DIR ([#4086](https://github.com/cookiecutter/cookiecutter-django/pull/4086)) +- Update postgres and redis to point to mini tiers ([#4099](https://github.com/cookiecutter/cookiecutter-django/pull/4099)) +### Updated +- Update coverage to 7.1.0 ([#4100](https://github.com/cookiecutter/cookiecutter-django/pull/4100)) + ## 2023.01.24 ### Updated diff --git a/setup.py b/setup.py index 0453c33ba..9dd893f97 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.24" +version = "2023.01.25" with open("README.rst") as readme_file: long_description = readme_file.read() From 7fcdeeae88ad998b652c518c86e91aed13e6a6dd Mon Sep 17 00:00:00 2001 From: tildebox <61698441+tildebox@users.noreply.github.com> Date: Thu, 26 Jan 2023 09:50:33 +0100 Subject: [PATCH 20/24] Rename BASE_DIR_PATH to BASE_DIR (#4102) Co-authored-by: example --- .../merge_production_dotenvs_in_dotenv.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py index e5f82504a..80780ead5 100644 --- a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py +++ b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py @@ -4,13 +4,13 @@ from pathlib import Path import pytest -BASE_DIR_PATH = Path(__file__).parent.resolve() -PRODUCTION_DOTENVS_DIR_PATH = BASE_DIR_PATH / ".envs" / ".production" +BASE_DIR = Path(__file__).parent.resolve() +PRODUCTION_DOTENVS_DIR_PATH = BASE_DIR / ".envs" / ".production" PRODUCTION_DOTENV_FILE_PATHS = [ PRODUCTION_DOTENVS_DIR_PATH / ".django", PRODUCTION_DOTENVS_DIR_PATH / ".postgres", ] -DOTENV_FILE_PATH = BASE_DIR_PATH / ".env" +DOTENV_FILE_PATH = BASE_DIR / ".env" def merge( From 099e49b7284e8f74f9ddf2c8a485d2cb3056246f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 26 Jan 2023 05:40:44 -0500 Subject: [PATCH 21/24] Update tox to 4.4.2 (#4101) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 44e403020..62e005a5b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ pre-commit==3.0.0 # Testing # ------------------------------------------------------------------------------ -tox==4.3.5 +tox==4.4.2 pytest==7.2.1 pytest-cookies==0.6.1 pytest-instafail==0.4.2 From 80405234c8e8ee16adb579a8e2d0b595efd505b3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 26 Jan 2023 15:21:47 -0500 Subject: [PATCH 22/24] Update pre-commit to 3.0.1 (#4104) --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 62e005a5b..ab9c8c8b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==22.12.0 isort==5.11.4 flake8==6.0.0 flake8-isort==6.0.0 -pre-commit==3.0.0 +pre-commit==3.0.1 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 447104dae..609b49789 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -36,7 +36,7 @@ pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==3.0.0 # https://github.com/pre-commit/pre-commit +pre-commit==3.0.1 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From 8ba930cd488f82989412f440ae3632a8751b706b Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 27 Jan 2023 02:27:06 +0000 Subject: [PATCH 23/24] Release 2023.01.26 --- CHANGELOG.md | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b1b47b52..32b3850fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.01.26 + +### Changed +- Rename BASE_DIR_PATH to BASE_DIR ([#4102](https://github.com/cookiecutter/cookiecutter-django/pull/4102)) +### Updated +- Update pre-commit to 3.0.1 ([#4104](https://github.com/cookiecutter/cookiecutter-django/pull/4104)) +- Update tox to 4.4.2 ([#4101](https://github.com/cookiecutter/cookiecutter-django/pull/4101)) + ## 2023.01.25 ### Changed diff --git a/setup.py b/setup.py index 9dd893f97..8e98d5142 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.25" +version = "2023.01.26" with open("README.rst") as readme_file: long_description = readme_file.read() From 900473777d9a80bf3e127d9b9b959a2257bb3202 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 27 Jan 2023 15:34:29 -0500 Subject: [PATCH 24/24] Update django-stubs to 1.14.0 (#4103) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 609b49789..ef0342a32 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,7 +14,7 @@ watchfiles==0.18.1 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==0.982 # https://github.com/python/mypy -django-stubs==1.13.2 # https://github.com/typeddjango/django-stubs +django-stubs==1.14.0 # https://github.com/typeddjango/django-stubs pytest==7.2.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.6 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %}