From 72e91da973e88ead4273b2c66ca9d4004284cf8e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jul 2023 10:21:53 -0300 Subject: [PATCH 001/120] Bump traefik (#4483) Bumps traefik from 2.10.3 to 2.10.4. --- updated-dependencies: - dependency-name: traefik dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../compose/production/traefik/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile index bdedff720..e547dfbb8 100644 --- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile @@ -1,4 +1,4 @@ -FROM traefik:2.10.3 +FROM traefik:2.10.4 RUN mkdir -p /etc/traefik/acme \ && touch /etc/traefik/acme/acme.json \ && chmod 600 /etc/traefik/acme/acme.json From 286c68c06f54db01cbebdee56e8309ca119cf519 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 26 Jul 2023 02:22:13 +0000 Subject: [PATCH 002/120] Release 2023.07.25 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 645064266..0b768dd32 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.07.25 + + +### Updated + +- Upgrade to traefik 2.10.4 ([#4483](https://github.com/cookiecutter/cookiecutter-django/pull/4483)) + ## 2023.07.24 diff --git a/setup.py b/setup.py index 43e1b54cf..d0647dde6 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.07.24" +version = "2023.07.25" with open("README.rst") as readme_file: long_description = readme_file.read() From eca21f5b774e427c49989530766f9aa660c3d264 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Wed, 26 Jul 2023 09:50:16 +0100 Subject: [PATCH 003/120] Update broken link to https Fix #4484 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a39fb084..d50537104 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ production-ready Django projects quickly. - Works with Python 3.11 - Renders Django projects with 100% starting test coverage - Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5 -- [12-Factor](http://12factor.net/) based settings via [django-environ](https://github.com/joke2k/django-environ) +- [12-Factor](https://12factor.net) based settings via [django-environ](https://github.com/joke2k/django-environ) - Secure by default. We believe in SSL. - Optimized development and production settings - Registration via [django-allauth](https://github.com/pennersr/django-allauth) From 01962fb3a1f79182470431caecf79282b10e9822 Mon Sep 17 00:00:00 2001 From: hleroy Date: Thu, 27 Jul 2023 13:28:49 +0200 Subject: [PATCH 004/120] Add Webpack instructions for developping locally with HTTPS (#4486) * Add Webpack instructions for developping locally with HTTPS * Fix formatting of code blocks --------- Co-authored-by: Bruno Alla --- docs/developing-locally-docker.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index c205c852b..135e063ef 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -330,3 +330,26 @@ See `https with nginx`_ for more information on this configuration. Add ``certs/*`` to the ``.gitignore`` file. This allows the folder to be included in the repo but its contents to be ignored. *This configuration is for local development environments only. Do not use this for production since you might expose your local* ``rootCA-key.pem``. + +Webpack +~~~~~~~ + +If you are using Webpack: + +1. On the ``nginx-proxy`` service in ``local.yml``, change ``depends_on`` to ``node`` instead of ``django``. + +2. On the ``node`` service in ``local.yml``, add the following environment configuration: + + :: + + environment: + - VIRTUAL_HOST=my-dev-env.local + - VIRTUAL_PORT=3000 + +3. Add the following configuration to the ``devServer`` section of ``webpack/dev.config.js``: + + :: + + client: { + webSocketURL: 'auto://0.0.0.0:0/ws', // note the `:0` after `0.0.0.0` + }, From 7a81a561c9f5461fd62666eef528df255b28d2d3 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 27 Jul 2023 11:29:24 +0000 Subject: [PATCH 005/120] 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 4419e2620..f7f31daa4 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1423,5 +1423,10 @@ "name": "Imran Rahman", "github_login": "infraredCoding", "twitter_username": "" + }, + { + "name": "hleroy", + "github_login": "hleroy", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 4941f07f7..35ab20aa4 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -936,6 +936,13 @@ Listed in alphabetical order. + + hleroy + + hleroy + + + Hoai-Thu Vuong From 0ecb9ce299c47339559480a41ba31dae00f689a6 Mon Sep 17 00:00:00 2001 From: Imran Rahman <63735892+infraredCoding@users.noreply.github.com> Date: Thu, 27 Jul 2023 19:42:04 +0600 Subject: [PATCH 006/120] Explicitly state that docker exec does not work for running management commands (#4487) Co-authored-by: Imran Rahman --- docs/developing-locally-docker.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index 135e063ef..6af4fe7c2 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -77,7 +77,7 @@ As with any shell command that we wish to run in our container, this is done usi $ docker compose -f local.yml run --rm django python manage.py createsuperuser Here, ``django`` is the target service we are executing the commands against. - +Also, please note that the ``docker exec`` does not work for running management commands. (Optionally) Designate your Docker Development Server IP -------------------------------------------------------- From 4e7aff306e154f7b2b1c89caeecb7620bf1fa371 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 28 Jul 2023 02:17:48 +0000 Subject: [PATCH 007/120] Release 2023.07.27 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b768dd32..aa1242245 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.07.27 + + +### Documentation + +- Document that `docker exec` does not work for running management commands ([#4487](https://github.com/cookiecutter/cookiecutter-django/pull/4487)) + +- Add Webpack instructions for developping locally with HTTPS ([#4486](https://github.com/cookiecutter/cookiecutter-django/pull/4486)) + ## 2023.07.25 diff --git a/setup.py b/setup.py index d0647dde6..f24a4e778 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.07.25" +version = "2023.07.27" with open("README.rst") as readme_file: long_description = readme_file.read() From 40ddc4b6af57c53b137981bf7b1c06c0d51c27d7 Mon Sep 17 00:00:00 2001 From: Shayan Karimi Date: Fri, 28 Jul 2023 15:33:47 +0330 Subject: [PATCH 008/120] Add support for Drone (#4382) * Add overall config for drone.io support * Update docs * Configure basic CI setup * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fix python image version for tests step --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- cookiecutter.json | 2 +- docs/project-generation-options.rst | 3 ++ hooks/post_gen_project.py | 7 ++++ tests/test_cookiecutter_generation.py | 1 + {{cookiecutter.project_slug}}/.drone.yml | 48 ++++++++++++++++++++++++ 5 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 {{cookiecutter.project_slug}}/.drone.yml diff --git a/cookiecutter.json b/cookiecutter.json index 3fcab4a78..f66e281f5 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -39,7 +39,7 @@ "use_sentry": "n", "use_whitenoise": "n", "use_heroku": "n", - "ci_tool": ["None", "Travis", "Gitlab", "Github"], + "ci_tool": ["None", "Travis", "Gitlab", "Github", "Drone"], "keep_local_envs_in_vcs": "y", "debug": "n" } diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst index edf2306d4..bd368ae84 100644 --- a/docs/project-generation-options.rst +++ b/docs/project-generation-options.rst @@ -135,6 +135,7 @@ ci_tool: 2. `Travis CI`_ 3. `Gitlab CI`_ 4. `Github Actions`_ + 5. `Drone CI`_ keep_local_envs_in_vcs: Indicates whether the project's ``.envs/.local/`` should be kept in VCS @@ -196,4 +197,6 @@ debug: .. _GitLab CI: https://docs.gitlab.com/ee/ci/ +.. _Drone CI: https://docs.drone.io/pipeline/overview/ + .. _Github Actions: https://docs.github.com/en/actions diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index a913f7592..b2578262d 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -238,6 +238,10 @@ def remove_dotgithub_folder(): shutil.rmtree(".github") +def remove_dotdrone_file(): + os.remove(".drone.yml") + + def generate_random_string(length, using_digits=False, using_ascii_letters=False, using_punctuation=False): """ Example: @@ -491,6 +495,9 @@ def main(): if "{{ cookiecutter.ci_tool }}" != "Github": remove_dotgithub_folder() + if "{{ cookiecutter.ci_tool }}" != "Drone": + remove_dotdrone_file() + if "{{ cookiecutter.use_drf }}".lower() == "n": remove_drf_starter_files() diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 853935e8c..87e52ef01 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -127,6 +127,7 @@ SUPPORTED_COMBINATIONS = [ {"ci_tool": "Travis"}, {"ci_tool": "Gitlab"}, {"ci_tool": "Github"}, + {"ci_tool": "Drone"}, {"keep_local_envs_in_vcs": "y"}, {"keep_local_envs_in_vcs": "n"}, {"debug": "y"}, diff --git a/{{cookiecutter.project_slug}}/.drone.yml b/{{cookiecutter.project_slug}}/.drone.yml new file mode 100644 index 000000000..dc08bfbab --- /dev/null +++ b/{{cookiecutter.project_slug}}/.drone.yml @@ -0,0 +1,48 @@ +kind: pipeline +name: default + +environment: + POSTGRES_USER: '{{ cookiecutter.project_slug }}' + POSTGRES_PASSWORD: '' + POSTGRES_DB: 'test_{{ cookiecutter.project_slug }}' + POSTGRES_HOST_AUTH_METHOD: trust + {%- if cookiecutter.use_celery == 'y' %} + CELERY_BROKER_URL: 'redis://redis:6379/0' + {%- endif %} + +steps: +- name: lint + pull: if-not-exists + image: python:3.11 + environment: + PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit + volumes: + - name: pre-commit cache + path: ${PRE_COMMIT_HOME} + commands: + - export PRE_COMMIT_HOME=$CI_PROJECT_DIR/.cache/pre-commit + - pip install -q pre-commit + - pre-commit run --show-diff-on-failure --color=always --all-files + +- name: test + pull: if-not-exists + {%- if cookiecutter.use_docker == 'y' %} + image: docker/compose:1.29.2 + environment: + DATABASE_URL: pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB + commands: + - docker-compose -f local.yml build + - docker-compose -f local.yml run --rm django python manage.py migrate + - docker-compose -f local.yml up -d + - docker-compose -f local.yml run django pytest + {%- else %} + image: python:3.11 + commands: + - pip install -r requirements/local.txt + - pytest + {%- endif%} + +volumes: +- name: pre-commit cache + host: + path: /tmp/drone/cache/pre-commit From 6354f7f64f43a38ab88bf58fdffcb98721dc1c02 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Fri, 28 Jul 2023 12:04:23 +0000 Subject: [PATCH 009/120] 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 f7f31daa4..51d31ea1e 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1428,5 +1428,10 @@ "name": "hleroy", "github_login": "hleroy", "twitter_username": "" + }, + { + "name": "Shayan Karimi", + "github_login": "shywn-mrk", + "twitter_username": "shywn_mrk" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 35ab20aa4..09f9d38d4 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1720,6 +1720,13 @@ Listed in alphabetical order. sebastianreyese + + Shayan Karimi + + shywn-mrk + + shywn_mrk + Simon Rey From a4c397890eb2bab001d83990c45d01eedceb27e3 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 29 Jul 2023 02:15:29 +0000 Subject: [PATCH 010/120] Release 2023.07.28 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa1242245..6c2ea2dcf 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.07.28 + + +### Changed + +- Add support for Drone CI ([#4382](https://github.com/cookiecutter/cookiecutter-django/pull/4382)) + ## 2023.07.27 diff --git a/setup.py b/setup.py index f24a4e778..67415da54 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.07.27" +version = "2023.07.28" with open("README.rst") as readme_file: long_description = readme_file.read() From 9eea9c894e3f0394b0ec4837a5d2e7db44ef9809 Mon Sep 17 00:00:00 2001 From: Sadra Yahyapour Date: Sun, 30 Jul 2023 14:45:06 +0330 Subject: [PATCH 011/120] README.md file extension issue fixed (#4488) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 67415da54..a0014cbe9 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ except ImportError: # We use calendar versioning version = "2023.07.28" -with open("README.rst") as readme_file: +with open("README.md") as readme_file: long_description = readme_file.read() setup( From 7b27d791fa767867ef3e338172aecc6411f87895 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 30 Jul 2023 11:15:43 +0000 Subject: [PATCH 012/120] 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 51d31ea1e..c115f8912 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1433,5 +1433,10 @@ "name": "Shayan Karimi", "github_login": "shywn-mrk", "twitter_username": "shywn_mrk" + }, + { + "name": "Sadra Yahyapour", + "github_login": "lnxpy", + "twitter_username": "lnxpylnxpy" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 09f9d38d4..f5dd8cf94 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1699,6 +1699,13 @@ Listed in alphabetical order. + + Sadra Yahyapour + + lnxpy + + lnxpylnxpy + Sam Collins From 7844cfe008941f3079407d66e54cc4854b935fb5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 31 Jul 2023 02:18:38 +0000 Subject: [PATCH 013/120] Release 2023.07.30 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c2ea2dcf..aca9023ee 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.07.30 + + +### Fixed + +- Fix `README.md` file extension in `setup.py` ([#4488](https://github.com/cookiecutter/cookiecutter-django/pull/4488)) + ## 2023.07.28 diff --git a/setup.py b/setup.py index a0014cbe9..bf69a61d8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.07.28" +version = "2023.07.30" with open("README.md") as readme_file: long_description = readme_file.read() From 82a944bc6745f175fb72606216aa53aa56f39026 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 1 Aug 2023 08:43:38 -0500 Subject: [PATCH 014/120] Update sentry-sdk to 1.29.1 (#4494) --- {{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 03b75a65f..7af905756 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.9 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.28.1 # https://github.com/getsentry/sentry-python +sentry-sdk==1.29.1 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.3 # https://github.com/redis/hiredis-py From 093b346b3db1dc3944982a698f24346c0cca7cd9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 1 Aug 2023 08:43:51 -0500 Subject: [PATCH 015/120] Update uvicorn to 0.23.2 (#4490) --- {{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 b0f47703f..719925eff 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -23,7 +23,7 @@ flower==2.0.0 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} -uvicorn[standard]==0.23.1 # https://github.com/encode/uvicorn +uvicorn[standard]==0.23.2 # https://github.com/encode/uvicorn {%- endif %} # Django From d54f29fd4fa92e30bf2494d945a1e4e083294680 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 1 Aug 2023 08:44:02 -0500 Subject: [PATCH 016/120] Update flake8 to 6.1.0 (#4489) * Update flake8 from 6.0.0 to 6.1.0 * Update flake8 from 6.0.0 to 6.1.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 160e70c11..cde8904cd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ binaryornot==0.4.4 # ------------------------------------------------------------------------------ black==23.7.0 isort==5.12.0 -flake8==6.0.0 +flake8==6.1.0 django-upgrade==1.14.0 djlint==1.32.1 pre-commit==3.3.3 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 569fd2331..a520aede4 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -28,7 +28,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ -flake8==6.0.0 # https://github.com/PyCQA/flake8 +flake8==6.1.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort coverage==7.2.7 # https://github.com/nedbat/coveragepy black==23.7.0 # https://github.com/psf/black From bc56102f1335f5e4c43df52f2e1be4128fdb460c Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Tue, 1 Aug 2023 20:56:51 +0100 Subject: [PATCH 017/120] Change how we remove prettier pre-commit hook from the config (#4450) --- hooks/post_gen_project.py | 19 +++++++++++++++++++ .../.pre-commit-config.yaml | 2 -- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index b2578262d..8d1be5a16 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -207,6 +207,24 @@ def handle_js_runner(choice, use_docker, use_async): remove_gulp_files() +def remove_prettier_pre_commit(): + with open(".pre-commit-config.yaml", "r") as fd: + content = fd.readlines() + + removing = False + new_lines = [] + for line in content: + if removing and "- repo:" in line: + removing = False + if "mirrors-prettier" in line: + removing = True + if not removing: + new_lines.append(line) + + with open(".pre-commit-config.yaml", "w") as fd: + fd.writelines(new_lines) + + def remove_celery_files(): file_names = [ os.path.join("config", "celery_app.py"), @@ -465,6 +483,7 @@ def main(): remove_webpack_files() remove_sass_files() remove_packagejson_file() + remove_prettier_pre_commit() if "{{ cookiecutter.use_docker }}".lower() == "y": remove_node_dockerfile() else: diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 0d1265ac2..5f65cbe62 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -16,7 +16,6 @@ repos: - id: check-case-conflict - id: check-docstring-first - id: detect-private-key -{%- if cookiecutter.frontend_pipeline in ["Webpack", "Gulp"] %} - repo: https://github.com/pre-commit/mirrors-prettier rev: v3.0.0-alpha.9-for-vscode @@ -24,7 +23,6 @@ repos: - id: prettier args: ['--tab-width', '2', '--single-quote'] exclude: '{{cookiecutter.project_slug}}/templates/' -{%- endif %} - repo: https://github.com/adamchainz/django-upgrade rev: '1.14.0' From 072372619d0f09d6779bc204fc9dc01f93671ea5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 1 Aug 2023 17:01:10 -0500 Subject: [PATCH 018/120] Update django from 4.2.3 to 4.2.4 (#4495) --- {{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 719925eff..50bac9671 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -28,7 +28,7 @@ uvicorn[standard]==0.23.2 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==4.2.3 # pyup: < 5.0 # https://www.djangoproject.com/ +django==4.2.4 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.10.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils django-allauth==0.54.0 # https://github.com/pennersr/django-allauth From bbfdbc8b0ebfc62978797958ecfe2a5e228717a4 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 1 Aug 2023 17:01:24 -0500 Subject: [PATCH 019/120] Update sentry-sdk from 1.29.1 to 1.29.2 (#4496) --- {{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 7af905756..6a6347ed0 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.9 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.29.1 # https://github.com/getsentry/sentry-python +sentry-sdk==1.29.2 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.3 # https://github.com/redis/hiredis-py From 9d33aca169996c79292a33ebf16216584596137b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 1 Aug 2023 17:02:09 -0500 Subject: [PATCH 020/120] Update django-anymail to 10.1 (#4497) * Update django-anymail from 10.0 to 10.1 * Update django-anymail from 10.0 to 10.1 * Update django-anymail from 10.0 to 10.1 * Update django-anymail from 10.0 to 10.1 * Update django-anymail from 10.0 to 10.1 * Update django-anymail from 10.0 to 10.1 * Update django-anymail from 10.0 to 10.1 * Update django-anymail from 10.0 to 10.1 * Update django-anymail from 10.0 to 10.1 --- .../requirements/production.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 6a6347ed0..da827e7e0 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,21 +24,21 @@ django-storages[google]==1.13.2 # https://github.com/jschneier/django-storages django-storages[azure]==1.13.2 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} -django-anymail[mailgun]==10.0 # https://github.com/anymail/django-anymail +django-anymail[mailgun]==10.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Amazon SES' %} -django-anymail[amazon-ses]==10.0 # https://github.com/anymail/django-anymail +django-anymail[amazon-ses]==10.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mailjet' %} -django-anymail[mailjet]==10.0 # https://github.com/anymail/django-anymail +django-anymail[mailjet]==10.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Mandrill' %} -django-anymail[mandrill]==10.0 # https://github.com/anymail/django-anymail +django-anymail[mandrill]==10.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Postmark' %} -django-anymail[postmark]==10.0 # https://github.com/anymail/django-anymail +django-anymail[postmark]==10.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Sendgrid' %} -django-anymail[sendgrid]==10.0 # https://github.com/anymail/django-anymail +django-anymail[sendgrid]==10.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SendinBlue' %} -django-anymail[sendinblue]==10.0 # https://github.com/anymail/django-anymail +django-anymail[sendinblue]==10.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'SparkPost' %} -django-anymail[sparkpost]==10.0 # https://github.com/anymail/django-anymail +django-anymail[sparkpost]==10.1 # https://github.com/anymail/django-anymail {%- elif cookiecutter.mail_service == 'Other SMTP' %} -django-anymail==10.0 # https://github.com/anymail/django-anymail +django-anymail==10.1 # https://github.com/anymail/django-anymail {%- endif %} From 64f660b17015baa30658d4dec1dd1296923747ad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 23:02:31 +0100 Subject: [PATCH 021/120] Auto-update pre-commit hooks (#4499) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 4 ++-- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 26f80b163..fd0613d0f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,7 +23,7 @@ repos: args: ["--tab-width", "2"] - repo: https://github.com/asottile/pyupgrade - rev: v3.9.0 + rev: v3.10.1 hooks: - id: pyupgrade args: [--py311-plus] @@ -40,7 +40,7 @@ repos: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 + rev: 6.1.0 hooks: - id: flake8 diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 5f65cbe62..14efb5e89 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: - id: detect-private-key - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0-alpha.9-for-vscode + rev: v3.0.0 hooks: - id: prettier args: ['--tab-width', '2', '--single-quote'] @@ -31,13 +31,13 @@ repos: args: ['--target-version', '4.2'] - repo: https://github.com/asottile/pyupgrade - rev: v3.7.0 + rev: v3.10.1 hooks: - id: pyupgrade args: [--py311-plus] - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 23.7.0 hooks: - id: black @@ -47,12 +47,12 @@ repos: - id: isort - repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 + rev: 6.1.0 hooks: - id: flake8 - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.31.1 + rev: v1.32.1 hooks: - id: djlint-reformat-django - id: djlint-django From 6a391713d8acf66e6f184366c615e94a3b44c9e6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 2 Aug 2023 02:14:43 +0000 Subject: [PATCH 022/120] Release 2023.08.01 --- CHANGELOG.md | 19 +++++++++++++++++++ setup.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aca9023ee..5a56ed6f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,25 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.08.01 + + +### Updated + +- Auto-update pre-commit hooks ([#4499](https://github.com/cookiecutter/cookiecutter-django/pull/4499)) + +- Update django-anymail to 10.1 ([#4497](https://github.com/cookiecutter/cookiecutter-django/pull/4497)) + +- Update sentry-sdk to 1.29.2 ([#4496](https://github.com/cookiecutter/cookiecutter-django/pull/4496)) + +- Update django to 4.2.4 ([#4495](https://github.com/cookiecutter/cookiecutter-django/pull/4495)) + +- Update flake8 to 6.1.0 ([#4489](https://github.com/cookiecutter/cookiecutter-django/pull/4489)) + +- Update uvicorn to 0.23.2 ([#4490](https://github.com/cookiecutter/cookiecutter-django/pull/4490)) + +- Update sentry-sdk to 1.29.1 ([#4494](https://github.com/cookiecutter/cookiecutter-django/pull/4494)) + ## 2023.07.30 diff --git a/setup.py b/setup.py index bf69a61d8..92a6b7667 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.07.30" +version = "2023.08.01" with open("README.md") as readme_file: long_description = readme_file.read() From ca99449e4af3544396c6e5af208077c8d3f58f72 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 4 Aug 2023 08:22:14 +0100 Subject: [PATCH 023/120] Auto-update pre-commit hooks (#4503) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fd0613d0f..1c7afbd52 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: - id: detect-private-key - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.0" + rev: "v3.0.1" hooks: - id: prettier args: ["--tab-width", "2"] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 14efb5e89..dcf5ec209 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: - id: detect-private-key - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0 + rev: v3.0.1 hooks: - id: prettier args: ['--tab-width', '2', '--single-quote'] From 98d973f4b181bb24252d677dd046cb80d55a9118 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 4 Aug 2023 02:22:29 -0500 Subject: [PATCH 024/120] Update cookiecutter from 2.2.3 to 2.3.0 (#4502) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cde8904cd..16632a16c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -cookiecutter==2.2.3 +cookiecutter==2.3.0 sh==2.0.4; sys_platform != "win32" binaryornot==0.4.4 From 39e7876ade4557b461a8780d447f4b4b8dd3edb1 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 5 Aug 2023 02:15:32 +0000 Subject: [PATCH 025/120] Release 2023.08.04 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a56ed6f4..fa5f4d1a0 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.08.04 + + +### Updated + +- Auto-update pre-commit hooks ([#4503](https://github.com/cookiecutter/cookiecutter-django/pull/4503)) + ## 2023.08.01 diff --git a/setup.py b/setup.py index 92a6b7667..6122d3f0f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.08.01" +version = "2023.08.04" with open("README.md") as readme_file: long_description = readme_file.read() From 6a15b4831e03ba399e072393cb9f420382f5037b Mon Sep 17 00:00:00 2001 From: mpsantos Date: Thu, 10 Aug 2023 09:57:47 -0300 Subject: [PATCH 026/120] Corrected 'or' translation to pt-br (#4507) --- .../locale/pt_BR/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po b/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po index 2556abba8..1681e0f57 100644 --- a/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po +++ b/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po @@ -127,7 +127,7 @@ msgstr "Ou, cadastre-se para uma conta em %(site_ #: {{cookiecutter.project_slug}}/templates/account/login.html:32 msgid "or" -msgstr "or" +msgstr "ou" #: {{cookiecutter.project_slug}}/templates/account/login.html:41 #, python-format From 3486a93f036328b85701202cbad5a5788faab5bb Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 10 Aug 2023 07:58:18 -0500 Subject: [PATCH 027/120] Update pygithub to 1.59.1 (#4501) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 16632a16c..527b3099d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ pyyaml==6.0.1 # Scripting # ------------------------------------------------------------------------------ -PyGithub==1.59.0 +PyGithub==1.59.1 gitpython==3.1.32 jinja2==3.1.2 requests==2.31.0 From 079260320e5ecfde8f2c2c4f4aa99802bb966395 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 10 Aug 2023 07:58:36 -0500 Subject: [PATCH 028/120] Update tox to 4.7.0 (#4505) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 527b3099d..cf21b1993 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==3.3.3 # Testing # ------------------------------------------------------------------------------ -tox==4.6.4 +tox==4.7.0 pytest==7.4.0 pytest-xdist==3.3.1 pytest-cookies==0.7.0 From 20730611d7e16eb0476ec1e802633df2a7d8d9ea Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 10 Aug 2023 07:59:06 -0500 Subject: [PATCH 029/120] Update sh to 2.0.6 (#4508) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cf21b1993..b2c1809f9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cookiecutter==2.3.0 -sh==2.0.4; sys_platform != "win32" +sh==2.0.6; sys_platform != "win32" binaryornot==0.4.4 # Code quality From bd153d06911f7c2291e96fa0d562f0e58aada1e5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 11 Aug 2023 02:08:04 +0000 Subject: [PATCH 030/120] Release 2023.08.10 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa5f4d1a0..70c5c84d7 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.08.10 + + +### Fixed + +- Corrected 'or' translation to pt-br ([#4507](https://github.com/cookiecutter/cookiecutter-django/pull/4507)) + ## 2023.08.04 diff --git a/setup.py b/setup.py index 6122d3f0f..34983e0b7 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.08.04" +version = "2023.08.10" with open("README.md") as readme_file: long_description = readme_file.read() From 3415586cf733fd7e84b1642930a163ec7222f9ad Mon Sep 17 00:00:00 2001 From: Tharushan Date: Mon, 14 Aug 2023 11:50:47 +0200 Subject: [PATCH 031/120] Fix `overrideCommand` value in `devcontainer` so that the `django` container can run (#4517) --- {{cookiecutter.project_slug}}/.devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.devcontainer/devcontainer.json b/{{cookiecutter.project_slug}}/.devcontainer/devcontainer.json index 6ec731ce5..393408582 100644 --- a/{{cookiecutter.project_slug}}/.devcontainer/devcontainer.json +++ b/{{cookiecutter.project_slug}}/.devcontainer/devcontainer.json @@ -24,7 +24,7 @@ ], // Tells devcontainer.json supporting services / tools whether they should run // /bin/sh -c "while sleep 1000; do :; done" when starting the container instead of the container’s default command - "overrideCommand": true, + "overrideCommand": false, "service": "django", // "remoteEnv": {"PATH": "/home/dev-user/.local/bin:${containerEnv:PATH}"}, "remoteUser": "dev-user", From d2b81ac39a7dcf25b4c15192a2e740f26f10995b Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 14 Aug 2023 09:51:28 +0000 Subject: [PATCH 032/120] 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 c115f8912..63e5d38db 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1438,5 +1438,10 @@ "name": "Sadra Yahyapour", "github_login": "lnxpy", "twitter_username": "lnxpylnxpy" + }, + { + "name": "Tharushan", + "github_login": "Tharushan", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index f5dd8cf94..ed7a95c36 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1818,6 +1818,13 @@ Listed in alphabetical order. + + Tharushan + + Tharushan + + + Thibault J. From 867daa226565753b891468b191737da2e1d49040 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 14 Aug 2023 04:51:45 -0500 Subject: [PATCH 033/120] Update tox to 4.8.0 (#4515) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b2c1809f9..fbe8dfdeb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==3.3.3 # Testing # ------------------------------------------------------------------------------ -tox==4.7.0 +tox==4.8.0 pytest==7.4.0 pytest-xdist==3.3.1 pytest-cookies==0.7.0 From a76f43dba9f844d3e34225cdd8e1defe46a218bc Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 14 Aug 2023 04:52:57 -0500 Subject: [PATCH 034/120] Update flower to 2.0.1 (#4518) --- {{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 50bac9671..c2ef23933 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -19,7 +19,7 @@ hiredis==2.2.3 # https://github.com/redis/hiredis-py celery==5.3.1 # pyup: < 6.0 # https://github.com/celery/celery django-celery-beat==2.5.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} -flower==2.0.0 # https://github.com/mher/flower +flower==2.0.1 # https://github.com/mher/flower {%- endif %} {%- endif %} {%- if cookiecutter.use_async == 'y' %} From b5b12b8f96216f9afc966cb531a4366a94c1db99 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 14 Aug 2023 04:53:14 -0500 Subject: [PATCH 035/120] Update django-debug-toolbar to 4.2.0 (#4511) --- {{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 a520aede4..b1dbbf984 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -43,7 +43,7 @@ pre-commit==3.3.3 # https://github.com/pre-commit/pre-commit # ------------------------------------------------------------------------------ factory-boy==3.3.0 # https://github.com/FactoryBoy/factory_boy -django-debug-toolbar==4.1.0 # https://github.com/jazzband/django-debug-toolbar +django-debug-toolbar==4.2.0 # https://github.com/jazzband/django-debug-toolbar django-extensions==3.2.3 # https://github.com/django-extensions/django-extensions django-coverage-plugin==3.1.0 # https://github.com/nedbat/django_coverage_plugin pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django From 7f59f85814dd0fe145fb6dbbd8007d675b5f4448 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 14 Aug 2023 04:53:37 -0500 Subject: [PATCH 036/120] Update coverage to 7.3.0 (#4516) --- {{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 b1dbbf984..accd841a2 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.1.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort -coverage==7.2.7 # https://github.com/nedbat/coveragepy +coverage==7.3.0 # https://github.com/nedbat/coveragepy black==23.7.0 # https://github.com/psf/black djlint==1.32.1 # https://github.com/Riverside-Healthcare/djLint pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django From 5d0a11b7d5f584c9d309e268f8a915b1399c1b36 Mon Sep 17 00:00:00 2001 From: Fateme Fouladkar <73009437+FatemeFouladkar@users.noreply.github.com> Date: Mon, 14 Aug 2023 13:25:28 +0330 Subject: [PATCH 037/120] Update README.md (#4514) * Update README.md * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d50537104..7f2c358e7 100644 --- a/README.md +++ b/README.md @@ -247,6 +247,7 @@ experience better. ## Articles +- [How to Make Your Own Django Cookiecutter Template!](https://medium.com/@FatemeFouladkar/how-to-make-your-own-django-cookiecutter-template-a753d4cbb8c2) - Aug. 10, 2023 - [Cookiecutter Django With Amazon RDS](https://haseeburrehman.com/posts/cookiecutter-django-with-amazon-rds/) - Apr, 2, 2021 - [Complete Walkthrough: Blue/Green Deployment to AWS ECS using GitHub actions](https://github.com/Andrew-Chen-Wang/cookiecutter-django-ecs-github) - June 10, 2020 - [Using cookiecutter-django with Google Cloud Storage](https://ahhda.github.io/cloud/gce/django/2019/03/12/using-django-cookiecutter-cloud-storage.html) - Mar. 12, 2019 From f89ff79aee368f9f8081b841feb5bffac95bc37a Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 14 Aug 2023 09:58:32 +0000 Subject: [PATCH 038/120] 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 63e5d38db..41ce426d7 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1443,5 +1443,10 @@ "name": "Tharushan", "github_login": "Tharushan", "twitter_username": "" + }, + { + "name": "Fateme Fouladkar", + "github_login": "FatemeFouladkar", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index ed7a95c36..f81671382 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -796,6 +796,13 @@ Listed in alphabetical order. fabaff + + Fateme Fouladkar + + FatemeFouladkar + + + Felipe Arruda From bf44d152ea4eb43d2265cf2f06b2d3c5d62ad948 Mon Sep 17 00:00:00 2001 From: zhaoruibing Date: Mon, 14 Aug 2023 03:22:25 -0700 Subject: [PATCH 039/120] Exclude env files from container image (add .envs/ to .dockerignore) (#4476) Currently, environment files are copied to container image during build. Environment files contains secrets and should not be in container images. Per [discussion 4474](https://github.com/cookiecutter/cookiecutter-django/discussions/4474), this is likely a bug. This change excludes all environment files from being copied to container image. Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/.dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/.dockerignore b/{{cookiecutter.project_slug}}/.dockerignore index 7369480e3..a602416cd 100644 --- a/{{cookiecutter.project_slug}}/.dockerignore +++ b/{{cookiecutter.project_slug}}/.dockerignore @@ -9,3 +9,4 @@ .travis.yml venv .git +.envs/ From 211b0571f3b1d2a69681ccf63273288f01427401 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 14 Aug 2023 10:23:06 +0000 Subject: [PATCH 040/120] 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 41ce426d7..48e9faad3 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1448,5 +1448,10 @@ "name": "Fateme Fouladkar", "github_login": "FatemeFouladkar", "twitter_username": "" + }, + { + "name": "zhaoruibing", + "github_login": "zhaoruibing", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index f81671382..38fc87e9b 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -2042,6 +2042,13 @@ Listed in alphabetical order. + + zhaoruibing + + zhaoruibing + + + ### Special Thanks From cbacbb75253d0683c940b05d7e9650a1e660d768 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 14 Aug 2023 11:48:37 +0100 Subject: [PATCH 041/120] Remove unused gulp-concat when Webpack is selected (#4520) Fix #4513 --- hooks/post_gen_project.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index 8d1be5a16..37f96efc0 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -183,6 +183,7 @@ def handle_js_runner(choice, use_docker, use_async): "browser-sync", "cssnano", "gulp", + "gulp-concat", "gulp-imagemin", "gulp-plumber", "gulp-postcss", From 4e9f9afd3d7404fc3dfb98798c001f612c99ff7a Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 14 Aug 2023 11:59:28 +0100 Subject: [PATCH 042/120] Install Django and DRF stubs with `compatible-mypy` extra (as per offical recommendation) (#4361) --- {{cookiecutter.project_slug}}/requirements/local.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index accd841a2..96bd10bf5 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,11 +14,11 @@ watchfiles==0.19.0 # https://github.com/samuelcolvin/watchfiles # Testing # ------------------------------------------------------------------------------ mypy==1.4.1 # https://github.com/python/mypy -django-stubs==4.2.3 # https://github.com/typeddjango/django-stubs +django-stubs[compatible-mypy]==4.2.3 # https://github.com/typeddjango/django-stubs pytest==7.4.0 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.7 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} -djangorestframework-stubs==3.14.2 # https://github.com/typeddjango/djangorestframework-stubs +djangorestframework-stubs[compatible-mypy]==3.14.2 # https://github.com/typeddjango/djangorestframework-stubs {%- endif %} # Documentation From 41d81b6286bea9c730c5fc225631daa66b5d936b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 14 Aug 2023 06:00:40 -0500 Subject: [PATCH 043/120] Update werkzeug to 2.3.7 (#4521) --- {{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 96bd10bf5..ebcfe8457 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,6 +1,6 @@ -r base.txt -Werkzeug[watchdog]==2.3.6 # https://github.com/pallets/werkzeug +Werkzeug[watchdog]==2.3.7 # https://github.com/pallets/werkzeug ipdb==0.13.13 # https://github.com/gotcha/ipdb {%- if cookiecutter.use_docker == 'y' %} psycopg[c]==3.1.9 # https://github.com/psycopg/psycopg From b9550a1dab0dd8f889d471c01bc6f09405e8aa85 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 14 Aug 2023 23:00:26 +0100 Subject: [PATCH 044/120] Prevent error in data migration caused by long project name (#4525) * Test very long project names on CI * Fix migration --- .github/workflows/ci.yml | 2 +- .../contrib/sites/migrations/0003_set_site_domain_and_name.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbda77b5e..3ff9f06aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: - name: Webpack args: "frontend_pipeline=Webpack use_heroku=y" - name: Email Username - args: "username_type=email ci_tool=Github" + args: "username_type=email ci_tool=Github project_name='Something superduper long - the great amazing project' project_slug=my_awesome_project" name: "Bare metal ${{ matrix.script.name }}" runs-on: ubuntu-latest diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0003_set_site_domain_and_name.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0003_set_site_domain_and_name.py index 080c734bb..e1822375b 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0003_set_site_domain_and_name.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0003_set_site_domain_and_name.py @@ -40,8 +40,8 @@ def update_site_forward(apps, schema_editor): _update_or_create_site_with_sequence( Site, schema_editor.connection, - "{{cookiecutter.domain_name}}", - "{{cookiecutter.project_name}}", + "{{ cookiecutter.domain_name }}", + "{{ cookiecutter.project_name[:50] }}", ) From b8e3f4a1bb7af54d7d594f479578b0898efc86a4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 15 Aug 2023 02:08:55 +0000 Subject: [PATCH 045/120] Release 2023.08.14 --- CHANGELOG.md | 27 +++++++++++++++++++++++++++ setup.py | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70c5c84d7..956c90fa5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,33 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.08.14 + + +### Changed + +- Install Django and DRF stubs with `compatible-mypy` extra (as per offical recommendation) ([#4361](https://github.com/cookiecutter/cookiecutter-django/pull/4361)) + +- Fix `overrideCommand` value in `devcontainer` so that the `django` container can run (#4517) ([#4517](https://github.com/cookiecutter/cookiecutter-django/pull/4517)) + +### Fixed + +- Prevent error in data migration caused by long project name ([#4525](https://github.com/cookiecutter/cookiecutter-django/pull/4525)) + +- Remove unused gulp-concat when Webpack is selected ([#4520](https://github.com/cookiecutter/cookiecutter-django/pull/4520)) + +- Exclude env files from container image (add .envs/ to .dockerignore) ([#4476](https://github.com/cookiecutter/cookiecutter-django/pull/4476)) + +### Updated + +- Update werkzeug to 2.3.7 ([#4521](https://github.com/cookiecutter/cookiecutter-django/pull/4521)) + +- Update coverage to 7.3.0 ([#4516](https://github.com/cookiecutter/cookiecutter-django/pull/4516)) + +- Update django-debug-toolbar to 4.2.0 ([#4511](https://github.com/cookiecutter/cookiecutter-django/pull/4511)) + +- Update flower to 2.0.1 ([#4518](https://github.com/cookiecutter/cookiecutter-django/pull/4518)) + ## 2023.08.10 diff --git a/setup.py b/setup.py index 34983e0b7..f6c0d0e8d 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.08.10" +version = "2023.08.14" with open("README.md") as readme_file: long_description = readme_file.read() From e79a909653773710c2468ad8faeb6c3063479150 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 15 Aug 2023 09:40:33 -0500 Subject: [PATCH 046/120] Update redis to 5.0.0 (#4526) --- {{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 c2ef23933..cd4a2363f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -11,7 +11,7 @@ argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.5.0 # https://github.com/evansd/whitenoise {%- endif %} -redis==4.6.0 # https://github.com/redis/redis-py +redis==5.0.0 # https://github.com/redis/redis-py {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %} hiredis==2.2.3 # https://github.com/redis/hiredis-py {%- endif %} From 1486f4f02c40d244e0b7082b2073f6e17a2aa8c6 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 16 Aug 2023 02:08:51 +0000 Subject: [PATCH 047/120] Release 2023.08.15 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 956c90fa5..9e5e65b00 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.08.15 + + +### Updated + +- Update redis to 5.0.0 ([#4526](https://github.com/cookiecutter/cookiecutter-django/pull/4526)) + ## 2023.08.14 diff --git a/setup.py b/setup.py index f6c0d0e8d..c377bf8e8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.08.14" +version = "2023.08.15" with open("README.md") as readme_file: long_description = readme_file.read() From ffa94efd5722585744bb718b4ece3f657f7fff35 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 16 Aug 2023 06:28:53 -0500 Subject: [PATCH 048/120] Update django-upgrade to 1.14.1 (#4528) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fbe8dfdeb..29cf7c24e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ binaryornot==0.4.4 black==23.7.0 isort==5.12.0 flake8==6.1.0 -django-upgrade==1.14.0 +django-upgrade==1.14.1 djlint==1.32.1 pre-commit==3.3.3 From 60c595771d52b516f5028e317098bad3e4d2f7ca Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 17 Aug 2023 02:07:28 +0000 Subject: [PATCH 049/120] Release 2023.08.16 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e5e65b00..5f4267922 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.08.16 + + +### Updated + +- Update django-upgrade to 1.14.1 ([#4528](https://github.com/cookiecutter/cookiecutter-django/pull/4528)) + ## 2023.08.15 diff --git a/setup.py b/setup.py index c377bf8e8..b952a674b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.08.15" +version = "2023.08.16" with open("README.md") as readme_file: long_description = readme_file.read() From eaebee84f19ebcbcd42532d0ad6cbf599a5421a5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 09:05:13 +0100 Subject: [PATCH 050/120] Auto-update pre-commit hooks (#4530) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1c7afbd52..87c796b0c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: - id: detect-private-key - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.1" + rev: "v3.0.2" hooks: - id: prettier args: ["--tab-width", "2"] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index dcf5ec209..0b68f4e2b 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -18,14 +18,14 @@ repos: - id: detect-private-key - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.1 + rev: v3.0.2 hooks: - id: prettier args: ['--tab-width', '2', '--single-quote'] exclude: '{{cookiecutter.project_slug}}/templates/' - repo: https://github.com/adamchainz/django-upgrade - rev: '1.14.0' + rev: '1.14.1' hooks: - id: django-upgrade args: ['--target-version', '4.2'] From 064bf21f52fa96d6f1f1ec0b3ea89bbe8fab2331 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 17 Aug 2023 03:06:12 -0500 Subject: [PATCH 051/120] Update tox from 4.8.0 to 4.9.0 (#4529) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 29cf7c24e..da008e6f4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==3.3.3 # Testing # ------------------------------------------------------------------------------ -tox==4.8.0 +tox==4.9.0 pytest==7.4.0 pytest-xdist==3.3.1 pytest-cookies==0.7.0 From 0336c1ab967f9c660d5da565db1d66a7d4537c0d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 17 Aug 2023 03:06:43 -0500 Subject: [PATCH 052/120] Update argon2-cffi from 21.3.0 to 23.1.0 (#4527) --- {{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 cd4a2363f..b5535a674 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -7,7 +7,7 @@ rcssmin==1.1.0 --install-option="--without-c-extensions" # https://github.com/n rcssmin==1.1.1 # https://github.com/ndparker/rcssmin {%- endif %} {%- endif %} -argon2-cffi==21.3.0 # https://github.com/hynek/argon2_cffi +argon2-cffi==23.1.0 # https://github.com/hynek/argon2_cffi {%- if cookiecutter.use_whitenoise == 'y' %} whitenoise==6.5.0 # https://github.com/evansd/whitenoise {%- endif %} From 2ff9a12c304543d1cf9a0e663430fd0c90b33ad9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 18 Aug 2023 02:08:43 +0000 Subject: [PATCH 053/120] Release 2023.08.17 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f4267922..1b178f809 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.08.17 + + +### Updated + +- Update argon2-cffi to 23.1.0 ([#4527](https://github.com/cookiecutter/cookiecutter-django/pull/4527)) + +- Auto-update pre-commit hooks ([#4530](https://github.com/cookiecutter/cookiecutter-django/pull/4530)) + ## 2023.08.16 diff --git a/setup.py b/setup.py index b952a674b..2b9b9cd1a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.08.16" +version = "2023.08.17" with open("README.md") as readme_file: long_description = readme_file.read() From 13b97de9d7722b8030809bfb83590e7074898fca Mon Sep 17 00:00:00 2001 From: John Date: Sat, 19 Aug 2023 15:31:53 -0400 Subject: [PATCH 054/120] Override _after_postgeneration to force save in User factory (#4534) * Override _after_postgeneration to force save Saving in _after_postgeneration was automatic in Factory Boy versions below 4.0, but must be done explicitly in newer versions. * Clean up formatting --- .../{{cookiecutter.project_slug}}/users/tests/factories.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py index 4b86f7985..bebd8adcf 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py @@ -29,6 +29,13 @@ class UserFactory(DjangoModelFactory): ) self.set_password(password) + @classmethod + def _after_postgeneration(cls, instance, create, results=None): + """Save again the instance if creating and at least one hook ran.""" + if create and results and not cls._meta.skip_postgeneration_save: + # Some post-generation hooks ran, and may have modified us. + instance.save() + class Meta: model = get_user_model() django_get_or_create = ["{{cookiecutter.username_type}}"] From 37c04a666610cd9a9ecafedcea5242008a827cd4 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 20 Aug 2023 02:08:46 +0000 Subject: [PATCH 055/120] Release 2023.08.19 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b178f809..8c5813122 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.08.19 + + +### Changed + +- Override `_after_postgeneration` to force save in `UserFactory` ([#4534](https://github.com/cookiecutter/cookiecutter-django/pull/4534)) + ## 2023.08.17 diff --git a/setup.py b/setup.py index 2b9b9cd1a..e47cc72ae 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.08.17" +version = "2023.08.19" with open("README.md") as readme_file: long_description = readme_file.read() From 3802572a88dc2fbca01366b32c4f8351baedda00 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 11:06:30 +0100 Subject: [PATCH 056/120] Update Python version from 3.11.4 to 3.11.5 (#4542) * Bump python in /{{cookiecutter.project_slug}}/compose/production/django Bumps python from 3.11.4-slim-bullseye to 3.11.5-slim-bullseye. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Bump python from 3.11.4-slim-bullseye to 3.11.5-slim-bullseye in /{{cookiecutter.project_slug}}/compose/local/django (#4544) Bumps python from 3.11.4-slim-bullseye to 3.11.5-slim-bullseye. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump python from 3.11.4-slim-bullseye to 3.11.5-slim-bullseye in /{{cookiecutter.project_slug}}/compose/local/docs (#4545) Bumps python from 3.11.4-slim-bullseye to 3.11.5-slim-bullseye. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update Heroku runtime to Python 3.11.5 --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 2 +- {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 2 +- .../compose/production/django/Dockerfile | 2 +- {{cookiecutter.project_slug}}/runtime.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile index 3636ce1ef..67571feed 100644 --- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile @@ -1,5 +1,5 @@ # define an alias for the specific python version used in this file. -FROM python:3.11.4-slim-bullseye as python +FROM python:3.11.5-slim-bullseye as python # Python build stage FROM python as python-build-stage diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile index f9895a083..1652ac2ce 100644 --- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile @@ -1,5 +1,5 @@ # define an alias for the specific python version used in this file. -FROM python:3.11.4-slim-bullseye as python +FROM python:3.11.5-slim-bullseye as python # Python build stage diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile index a48cbc4af..49950b9af 100644 --- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile +++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile @@ -25,7 +25,7 @@ RUN npm run build {%- endif %} # define an alias for the specific python version used in this file. -FROM python:3.11.4-slim-bullseye as python +FROM python:3.11.5-slim-bullseye as python # Python build stage FROM python as python-build-stage diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt index 431fc7e8c..3124d55e9 100644 --- a/{{cookiecutter.project_slug}}/runtime.txt +++ b/{{cookiecutter.project_slug}}/runtime.txt @@ -1 +1 @@ -python-3.11.4 +python-3.11.5 From 4cdfea39773ff6924b45ac219a79bd069f84b29c Mon Sep 17 00:00:00 2001 From: MinWoo Sung Date: Mon, 28 Aug 2023 19:09:15 +0900 Subject: [PATCH 057/120] add compatibility options for black and flake8 (#4541) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add compatibility options for black and flake8 * remove flake8 args option --------- Co-authored-by: 성민우 --- .flake8 | 1 + {{cookiecutter.project_slug}}/setup.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/.flake8 b/.flake8 index 84b4b4411..3a87b269b 100644 --- a/.flake8 +++ b/.flake8 @@ -1,3 +1,4 @@ [flake8] exclude = docs max-line-length = 119 +extend-ignore = E203 diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg index 829064213..2412f1746 100644 --- a/{{cookiecutter.project_slug}}/setup.cfg +++ b/{{cookiecutter.project_slug}}/setup.cfg @@ -4,6 +4,7 @@ [flake8] max-line-length = 119 exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv,.venv +extend-ignore = E203 [pycodestyle] max-line-length = 119 From 27f221daff84319548d0aa0252654fd4f480b1b6 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 28 Aug 2023 10:10:05 +0000 Subject: [PATCH 058/120] 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 48e9faad3..426689770 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1453,5 +1453,10 @@ "name": "zhaoruibing", "github_login": "zhaoruibing", "twitter_username": "" + }, + { + "name": "MinWoo Sung", + "github_login": "SungMinWoo", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 38fc87e9b..c1d85202a 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1468,6 +1468,13 @@ Listed in alphabetical order. + + MinWoo Sung + + SungMinWoo + + + monosans From b0c0bb230577c25129f66c294b39931be8df82ca Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 28 Aug 2023 07:28:49 -0500 Subject: [PATCH 059/120] Update watchfiles to 0.20.0 (#4537) --- {{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 ebcfe8457..20f6b41d1 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.9 # https://github.com/psycopg/psycopg psycopg[binary]==3.1.9 # https://github.com/psycopg/psycopg {%- endif %} {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %} -watchfiles==0.19.0 # https://github.com/samuelcolvin/watchfiles +watchfiles==0.20.0 # https://github.com/samuelcolvin/watchfiles {%- endif %} # Testing From c021908c433d7ec5e73d685f7227bb505e477603 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 28 Aug 2023 07:29:23 -0500 Subject: [PATCH 060/120] Update django-allauth to 0.55.0 (#4535) --- {{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 b5535a674..bf5bfde69 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -31,7 +31,7 @@ uvicorn[standard]==0.23.2 # https://github.com/encode/uvicorn django==4.2.4 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.10.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils -django-allauth==0.54.0 # https://github.com/pennersr/django-allauth +django-allauth==0.55.0 # https://github.com/pennersr/django-allauth django-crispy-forms==2.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' %} From b117f003fb06a7f3186c24bc80650da8353ce62a Mon Sep 17 00:00:00 2001 From: itisnotyourenv <64085243+itisnotyourenv@users.noreply.github.com> Date: Mon, 28 Aug 2023 21:02:09 +0300 Subject: [PATCH 061/120] Change `MEDIA_URL` to an absolute URL in tests (#4460) * fixture for changing media url * Customise MEDIA_URL setting instead of using fixture --------- Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/config/settings/test.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py index 92211ec76..68126182e 100644 --- a/{{cookiecutter.project_slug}}/config/settings/test.py +++ b/{{cookiecutter.project_slug}}/config/settings/test.py @@ -29,6 +29,11 @@ EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend" # ------------------------------------------------------------------------------ TEMPLATES[0]["OPTIONS"]["debug"] = True # type: ignore # noqa: F405 +# MEDIA +# ------------------------------------------------------------------------------ +# https://docs.djangoproject.com/en/dev/ref/settings/#media-url +MEDIA_URL = 'http://media.testserver' + {%- if cookiecutter.frontend_pipeline == 'Webpack' %} # django-webpack-loader # ------------------------------------------------------------------------------ From b0b0f33f407721f3bd9f37c211e75c4128ad90fe Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 28 Aug 2023 18:03:02 +0000 Subject: [PATCH 062/120] 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 426689770..fab5e5f56 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1458,5 +1458,10 @@ "name": "MinWoo Sung", "github_login": "SungMinWoo", "twitter_username": "" + }, + { + "name": "itisnotyourenv", + "github_login": "itisnotyourenv", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index c1d85202a..1e7bfd7ac 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -999,6 +999,13 @@ Listed in alphabetical order. + + itisnotyourenv + + itisnotyourenv + + + Ivan Khomutov From c67f5ee27ce981b5071dbb84c14aefee830ec904 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 28 Aug 2023 19:09:54 +0100 Subject: [PATCH 063/120] Add French translations (#4454) --- .../config/settings/base.py | 3 +- .../locale/fr_FR/LC_MESSAGES/django.po | 335 ++++++++++++++++++ 2 files changed, 337 insertions(+), 1 deletion(-) create mode 100644 {{cookiecutter.project_slug}}/locale/fr_FR/LC_MESSAGES/django.po diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index f02d476c1..688713313 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -30,7 +30,8 @@ LANGUAGE_CODE = "en-us" # from django.utils.translation import gettext_lazy as _ # LANGUAGES = [ # ('en', _('English')), -# ('pt-br', _('Português')), +# ('fr-fr', _('French')), +# ('pt-br', _('Portuguese')), # ] # https://docs.djangoproject.com/en/dev/ref/settings/#site-id SITE_ID = 1 diff --git a/{{cookiecutter.project_slug}}/locale/fr_FR/LC_MESSAGES/django.po b/{{cookiecutter.project_slug}}/locale/fr_FR/LC_MESSAGES/django.po new file mode 100644 index 000000000..67434d505 --- /dev/null +++ b/{{cookiecutter.project_slug}}/locale/fr_FR/LC_MESSAGES/django.po @@ -0,0 +1,335 @@ +# Translations for the {{ cookiecutter.project_name }} project +# Copyright (C) {% now 'utc', '%Y' %} {{ cookiecutter.author_name }} +# {{ cookiecutter.author_name }} <{{ cookiecutter.email }}>, {% now 'utc', '%Y' %}. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: {{ cookiecutter.version }}\n" +"Language: fr-FR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: {{cookiecutter.project_slug}}/templates/account/account_inactive.html:5 +#: {{cookiecutter.project_slug}}/templates/account/account_inactive.html:8 +msgid "Account Inactive" +msgstr "Compte inactif" + +#: {{cookiecutter.project_slug}}/templates/account/account_inactive.html:10 +msgid "This account is inactive." +msgstr "Ce compte est inactif." + +#: {{cookiecutter.project_slug}}/templates/account/email.html:7 +msgid "Account" +msgstr "Compte" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:10 +msgid "E-mail Addresses" +msgstr "Adresses e-mail" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:13 +msgid "The following e-mail addresses are associated with your account:" +msgstr "Les adresses e-mail suivantes sont associées à votre compte :" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:27 +msgid "Verified" +msgstr "Vérifié" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:29 +msgid "Unverified" +msgstr "Non vérifié" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:31 +msgid "Primary" +msgstr "Primaire" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:37 +msgid "Make Primary" +msgstr "Changer Primaire" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:38 +msgid "Re-send Verification" +msgstr "Renvoyer vérification" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:39 +msgid "Remove" +msgstr "Supprimer" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:46 +msgid "Warning:" +msgstr "Avertissement:" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:46 +msgid "" +"You currently do not have any e-mail address set up. You should really add " +"an e-mail address so you can receive notifications, reset your password, etc." +msgstr "" +"Vous n'avez actuellement aucune adresse e-mail configurée. Vous devriez ajouter " +"une adresse e-mail pour reçevoir des notifications, réinitialiser votre mot " +"de passe, etc." + +#: {{cookiecutter.project_slug}}/templates/account/email.html:51 +msgid "Add E-mail Address" +msgstr "Ajouter une adresse e-mail" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:56 +msgid "Add E-mail" +msgstr "Ajouter e-mail" + +#: {{cookiecutter.project_slug}}/templates/account/email.html:66 +msgid "Do you really want to remove the selected e-mail address?" +msgstr "Voulez-vous vraiment supprimer l'adresse e-mail sélectionnée ?" + +#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:6 +#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:10 +msgid "Confirm E-mail Address" +msgstr "Confirmez votre adresse email" + +#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:16 +#, python-format +msgid "" +"Please confirm that %(email)s is an e-mail " +"address for user %(user_display)s." +msgstr "" +"Veuillez confirmer que %(email)s est un e-mail " +"adresse de l'utilisateur %(user_display)s." + +#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:20 +msgid "Confirm" +msgstr "Confirm" + +#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:27 +#, python-format +msgid "" +"This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request." +msgstr "" +"Ce lien de confirmation par e-mail a expiré ou n'est pas valide. Veuillez" + "émettre une nouvelle demande de confirmation " +"par e-mail." + +#: {{cookiecutter.project_slug}}/templates/account/login.html:7 +#: {{cookiecutter.project_slug}}/templates/account/login.html:11 +#: {{cookiecutter.project_slug}}/templates/account/login.html:56 +#: {{cookiecutter.project_slug}}/templates/base.html:72 +msgid "Sign In" +msgstr "S'identifier" + +#: {{cookiecutter.project_slug}}/templates/account/login.html:17 +msgid "Please sign in with one of your existing third party accounts:" +msgstr "Veuillez vous connecter avec l'un de vos comptes tiers existants :" + +#: {{cookiecutter.project_slug}}/templates/account/login.html:19 +#, python-format +msgid "" +"Or, sign up for a %(site_name)s account and " +"sign in below:" +msgstr "" +"Ou, créez un compte %(site_name)s et " +"connectez-vous ci-dessous :" + +#: {{cookiecutter.project_slug}}/templates/account/login.html:32 +msgid "or" +msgstr "ou" + +#: {{cookiecutter.project_slug}}/templates/account/login.html:41 +#, python-format +msgid "" +"If you have not created an account yet, then please sign up first." +msgstr "" +"Si vous n'avez pas encore créé de compte, veuillez d'abord vous inscrire." + +#: {{cookiecutter.project_slug}}/templates/account/login.html:55 +msgid "Forgot Password?" +msgstr "Mot de passe oublié?" + +#: {{cookiecutter.project_slug}}/templates/account/logout.html:5 +#: {{cookiecutter.project_slug}}/templates/account/logout.html:8 +#: {{cookiecutter.project_slug}}/templates/account/logout.html:17 +#: {{cookiecutter.project_slug}}/templates/base.html:61 +msgid "Sign Out" +msgstr "Se déconnecter" + +#: {{cookiecutter.project_slug}}/templates/account/logout.html:10 +msgid "Are you sure you want to sign out?" +msgstr "Êtes-vous certain de vouloir vous déconnecter?" + +#: {{cookiecutter.project_slug}}/templates/account/password_change.html:6 +#: {{cookiecutter.project_slug}}/templates/account/password_change.html:9 +#: {{cookiecutter.project_slug}}/templates/account/password_change.html:14 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:5 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:8 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html:4 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html:7 +msgid "Change Password" +msgstr "Changer le mot de passe" + +#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:7 +#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:11 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_done.html:6 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_done.html:9 +msgid "Password Reset" +msgstr "Réinitialisation du mot de passe" + +#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:16 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll send you " +"an e-mail allowing you to reset it." +msgstr "" +"Mot de passe oublié? Entrez votre adresse e-mail ci-dessous, et nous vous " +"enverrons un e-mail vous permettant de le réinitialiser." + +#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:21 +msgid "Reset My Password" +msgstr "Réinitialiser mon mot de passe" + +#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:24 +msgid "Please contact us if you have any trouble resetting your password." +msgstr "" +"Veuillez nous contacter si vous rencontrez des difficultés pour réinitialiser" +"votre mot de passe." + +#: {{cookiecutter.project_slug}}/templates/account/password_reset_done.html:15 +msgid "" +"We have sent you an e-mail. Please contact us if you do not receive it " +"within a few minutes." +msgstr "" +"Nous vous avons envoyé un e-mail. Veuillez nous contacter si vous ne le " +"recevez pas d'ici quelques minutes." + +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:8 +msgid "Bad Token" +msgstr "Token Invalide" + +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:12 +#, python-format +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" +"Le lien de réinitialisation du mot de passe n'était pas valide, peut-être parce " +"qu'il a déjà été utilisé. Veuillez faire une " +"nouvelle demande de réinitialisation de mot de passe." + +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:18 +msgid "change password" +msgstr "changer le mot de passe" + +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:21 +#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html:8 +msgid "Your password is now changed." +msgstr "Votre mot de passe est maintenant modifié." + +#: {{cookiecutter.project_slug}}/templates/account/password_set.html:6 +#: {{cookiecutter.project_slug}}/templates/account/password_set.html:9 +#: {{cookiecutter.project_slug}}/templates/account/password_set.html:14 +msgid "Set Password" +msgstr "Définir le mot de passe" + +#: {{cookiecutter.project_slug}}/templates/account/signup.html:6 +msgid "Signup" +msgstr "S'inscrire" + +#: {{cookiecutter.project_slug}}/templates/account/signup.html:9 +#: {{cookiecutter.project_slug}}/templates/account/signup.html:19 +#: {{cookiecutter.project_slug}}/templates/base.html:67 +msgid "Sign Up" +msgstr "S'inscrire" + +#: {{cookiecutter.project_slug}}/templates/account/signup.html:11 +#, python-format +msgid "" +"Already have an account? Then please sign in." +msgstr "" +"Vous avez déjà un compte? Alors veuillez vous connecter." + +#: {{cookiecutter.project_slug}}/templates/account/signup_closed.html:5 +#: {{cookiecutter.project_slug}}/templates/account/signup_closed.html:8 +msgid "Sign Up Closed" +msgstr "Inscriptions closes" + +#: {{cookiecutter.project_slug}}/templates/account/signup_closed.html:10 +msgid "We are sorry, but the sign up is currently closed." +msgstr "Désolé, mais l'inscription est actuellement fermée." + +#: {{cookiecutter.project_slug}}/templates/account/verification_sent.html:5 +#: {{cookiecutter.project_slug}}/templates/account/verification_sent.html:8 +#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:5 +#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:8 +msgid "Verify Your E-mail Address" +msgstr "Vérifiez votre adresse e-mail" + +#: {{cookiecutter.project_slug}}/templates/account/verification_sent.html:10 +msgid "" +"We have sent an e-mail to you for verification. Follow the link provided to " +"finalize the signup process. Please contact us if you do not receive it " +"within a few minutes." +msgstr "Nous vous avons envoyé un e-mail pour vérification. Suivez le lien fourni " +"pour finalisez le processus d'inscription. Veuillez nous contacter si vous ne le " +"recevez pas d'ici quelques minutes." + +#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:12 +msgid "" +"This part of the site requires us to verify that\n" +"you are who you claim to be. For this purpose, we require that you\n" +"verify ownership of your e-mail address. " +msgstr "" +"Cette partie du site nous oblige à vérifier que\n" +"vous êtes qui vous prétendez être. Nous vous demandons donc de\n" +"vérifier la propriété de votre adresse e-mail." + +#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:16 +msgid "" +"We have sent an e-mail to you for\n" +"verification. Please click on the link inside this e-mail. Please\n" +"contact us if you do not receive it within a few minutes." +msgstr "" +"Nous vous avons envoyé un e-mail pour\n" +"vérification. Veuillez cliquer sur le lien contenu dans cet e-mail. Veuillez nous\n" +"contacter si vous ne le recevez pas d'ici quelques minutes." + +#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:20 +#, python-format +msgid "" +"Note: you can still change your e-" +"mail address." +msgstr "" +"Remarque : vous pouvez toujours changer votre e-" +"adresse e-mail." + +#: {{cookiecutter.project_slug}}/templates/base.html:57 +msgid "My Profile" +msgstr "Mon Profil" + +#: {{cookiecutter.project_slug}}/users/admin.py:17 +msgid "Personal info" +msgstr "Personal info" + +#: {{cookiecutter.project_slug}}/users/admin.py:19 +msgid "Permissions" +msgstr "Permissions" + +#: {{cookiecutter.project_slug}}/users/admin.py:30 +msgid "Important dates" +msgstr "Dates importantes" + +#: {{cookiecutter.project_slug}}/users/apps.py:7 +msgid "Users" +msgstr "Utilisateurs" + +#: {{cookiecutter.project_slug}}/users/forms.py:24 +#: {{cookiecutter.project_slug}}/users/tests/test_forms.py:36 +msgid "This username has already been taken." +msgstr "Ce nom d'utilisateur est déjà pris." + +#: {{cookiecutter.project_slug}}/users/models.py:15 +msgid "Name of User" +msgstr "Nom de l'utilisateur" + +#: {{cookiecutter.project_slug}}/users/views.py:23 +msgid "Information successfully updated" +msgstr "Informations mises à jour avec succès" From ab51976781a735e7416b5bfe006a1319b03cf0c7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 29 Aug 2023 02:37:42 +0000 Subject: [PATCH 064/120] Release 2023.08.28 --- CHANGELOG.md | 21 +++++++++++++++++++++ setup.py | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c5813122..e919b3666 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,27 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.08.28 + + +### Changed + +- Add French translations ([#4454](https://github.com/cookiecutter/cookiecutter-django/pull/4454)) + +- Change `MEDIA_URL` to an absolute URL in tests ([#4460](https://github.com/cookiecutter/cookiecutter-django/pull/4460)) + +### Fixed + +- Fix a small compatibility issue between black and flake8 ([#4541](https://github.com/cookiecutter/cookiecutter-django/pull/4541)) + +### Updated + +- Update django-allauth to 0.55.0 ([#4535](https://github.com/cookiecutter/cookiecutter-django/pull/4535)) + +- Update watchfiles to 0.20.0 ([#4537](https://github.com/cookiecutter/cookiecutter-django/pull/4537)) + +- Update Python version from 3.11.4 to 3.11.5 ([#4542](https://github.com/cookiecutter/cookiecutter-django/pull/4542)) + ## 2023.08.19 diff --git a/setup.py b/setup.py index e47cc72ae..92dfd8b08 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.08.19" +version = "2023.08.28" with open("README.md") as readme_file: long_description = readme_file.read() From 944399c2ef3b59c80def5eab32f9105e83fbe77a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 29 Aug 2023 11:37:57 -0500 Subject: [PATCH 065/120] Update sentry-sdk to 1.30.0 (#4546) --- {{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 da827e7e0..f04c04ffb 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.9 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.29.2 # https://github.com/getsentry/sentry-python +sentry-sdk==1.30.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.3 # https://github.com/redis/hiredis-py From fb55b453647a2ec108785621b369c7f849b889ba Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 30 Aug 2023 02:09:44 +0000 Subject: [PATCH 066/120] Release 2023.08.29 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e919b3666..e53b7f46a 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.08.29 + + +### Updated + +- Update sentry-sdk to 1.30.0 ([#4546](https://github.com/cookiecutter/cookiecutter-django/pull/4546)) + ## 2023.08.28 diff --git a/setup.py b/setup.py index 92dfd8b08..cd763a410 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.08.28" +version = "2023.08.29" with open("README.md") as readme_file: long_description = readme_file.read() From 682c3ce34b258cc00fff822a04326af63d844246 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 30 Aug 2023 13:19:51 -0500 Subject: [PATCH 067/120] Update django-environ from 0.10.0 to 0.11.0 (#4548) --- {{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 bf5bfde69..a1658167f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.23.2 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ django==4.2.4 # pyup: < 5.0 # https://www.djangoproject.com/ -django-environ==0.10.0 # https://github.com/joke2k/django-environ +django-environ==0.11.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils django-allauth==0.55.0 # https://github.com/pennersr/django-allauth django-crispy-forms==2.0 # https://github.com/django-crispy-forms/django-crispy-forms From 8e052bc37e2ba54d0fa9785bee445f72a5717280 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 31 Aug 2023 02:10:23 +0000 Subject: [PATCH 068/120] Release 2023.08.30 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e53b7f46a..e3021a073 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.08.30 + + +### Updated + +- Update django-environ to 0.11.0 ([#4548](https://github.com/cookiecutter/cookiecutter-django/pull/4548)) + ## 2023.08.29 diff --git a/setup.py b/setup.py index cd763a410..262f55b40 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.08.29" +version = "2023.08.30" with open("README.md") as readme_file: long_description = readme_file.read() From 0f676416551fff8d81542e942a66b3851626b777 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 31 Aug 2023 10:02:12 -0500 Subject: [PATCH 069/120] Update celery from 5.3.1 to 5.3.3 (#4553) --- {{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 a1658167f..2fcbd4837 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -16,7 +16,7 @@ redis==5.0.0 # https://github.com/redis/redis-py hiredis==2.2.3 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} -celery==5.3.1 # pyup: < 6.0 # https://github.com/celery/celery +celery==5.3.3 # pyup: < 6.0 # https://github.com/celery/celery django-celery-beat==2.5.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} flower==2.0.1 # https://github.com/mher/flower From 4169c06e5d7a00502c70cbb83d67ae4b7a8ab0a6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 31 Aug 2023 13:02:02 -0500 Subject: [PATCH 070/120] Update django-allauth from 0.55.0 to 0.55.2 (#4549) --- {{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 2fcbd4837..7a5a8f80c 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -31,7 +31,7 @@ uvicorn[standard]==0.23.2 # https://github.com/encode/uvicorn django==4.2.4 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.11.0 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils -django-allauth==0.55.0 # https://github.com/pennersr/django-allauth +django-allauth==0.55.2 # https://github.com/pennersr/django-allauth django-crispy-forms==2.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' %} From a46c0e1f6955f39da0bacbf52da760d79c5579c6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 19:02:24 +0100 Subject: [PATCH 071/120] Auto-update pre-commit hooks (#4550) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 87c796b0c..6243406b0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: - id: detect-private-key - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.2" + rev: "v3.0.3" hooks: - id: prettier args: ["--tab-width", "2"] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 0b68f4e2b..2a03db795 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -18,7 +18,7 @@ repos: - id: detect-private-key - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.2 + rev: v3.0.3 hooks: - id: prettier args: ['--tab-width', '2', '--single-quote'] From 19855818c816706d5a22fa930a12f6320c070b38 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 1 Sep 2023 02:12:47 +0000 Subject: [PATCH 072/120] Release 2023.08.31 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3021a073..506a40b2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.08.31 + + +### Updated + +- Auto-update pre-commit hooks ([#4550](https://github.com/cookiecutter/cookiecutter-django/pull/4550)) + +- Update django-allauth to 0.55.2 ([#4549](https://github.com/cookiecutter/cookiecutter-django/pull/4549)) + +- Update celery to 5.3.3 ([#4553](https://github.com/cookiecutter/cookiecutter-django/pull/4553)) + ## 2023.08.30 diff --git a/setup.py b/setup.py index 262f55b40..e9931cf86 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.08.30" +version = "2023.08.31" with open("README.md") as readme_file: long_description = readme_file.read() From 759508cb459f74680f822d0416bb77c71316ab1e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 1 Sep 2023 02:26:10 -0500 Subject: [PATCH 073/120] Update gitpython from 3.1.32 to 3.1.33 (#4555) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index da008e6f4..b7af3c083 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,6 +23,6 @@ pyyaml==6.0.1 # Scripting # ------------------------------------------------------------------------------ PyGithub==1.59.1 -gitpython==3.1.32 +gitpython==3.1.33 jinja2==3.1.2 requests==2.31.0 From 7a23ea9e360c91fd7bbe4054a4e187edff56f877 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 2 Sep 2023 02:07:26 +0000 Subject: [PATCH 074/120] Release 2023.09.01 --- CHANGELOG.md | 3 +++ setup.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 506a40b2c..b99ab0045 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.09.01 + + ## 2023.08.31 diff --git a/setup.py b/setup.py index e9931cf86..b0f11511b 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.08.31" +version = "2023.09.01" with open("README.md") as readme_file: long_description = readme_file.read() From 62d3cbf4182406741e4ddad1d2185fa5919988a1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 2 Sep 2023 00:00:36 -0500 Subject: [PATCH 075/120] Update tox from 4.9.0 to 4.11.1 (#4557) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b7af3c083..da7c4d6b1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==3.3.3 # Testing # ------------------------------------------------------------------------------ -tox==4.9.0 +tox==4.11.1 pytest==7.4.0 pytest-xdist==3.3.1 pytest-cookies==0.7.0 From e9b3b221568be2df7fe50f3a3c0d626208676765 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 2 Sep 2023 00:00:55 -0500 Subject: [PATCH 076/120] Update django-environ from 0.11.0 to 0.11.2 (#4558) --- {{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 7a5a8f80c..88c9af455 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -29,7 +29,7 @@ uvicorn[standard]==0.23.2 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ django==4.2.4 # pyup: < 5.0 # https://www.djangoproject.com/ -django-environ==0.11.0 # https://github.com/joke2k/django-environ +django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils django-allauth==0.55.2 # https://github.com/pennersr/django-allauth django-crispy-forms==2.0 # https://github.com/django-crispy-forms/django-crispy-forms From 22c18ee6cc28ebb5286359fc1aa1e73dd9fa53e4 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 2 Sep 2023 06:58:37 -0500 Subject: [PATCH 077/120] Update gitpython from 3.1.33 to 3.1.34 (#4559) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index da7c4d6b1..03b1c9253 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,6 +23,6 @@ pyyaml==6.0.1 # Scripting # ------------------------------------------------------------------------------ PyGithub==1.59.1 -gitpython==3.1.33 +gitpython==3.1.34 jinja2==3.1.2 requests==2.31.0 From 80f6d46e9ad53e822de1228c52b5e431f500b59b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 2 Sep 2023 17:13:09 -0500 Subject: [PATCH 078/120] Update pre-commit to 3.4.0 (#4560) * Update pre-commit from 3.3.3 to 3.4.0 * Update pre-commit from 3.3.3 to 3.4.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 03b1c9253..eeb5cba72 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ isort==5.12.0 flake8==6.1.0 django-upgrade==1.14.1 djlint==1.32.1 -pre-commit==3.3.3 +pre-commit==3.4.0 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 20f6b41d1..4c8568565 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -37,7 +37,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.3.3 # https://github.com/pre-commit/pre-commit +pre-commit==3.4.0 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From d19d10639aa47e3748399c5fc431e51d2772ec9e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 2 Sep 2023 17:13:39 -0500 Subject: [PATCH 079/120] Update pytest to 7.4.1 (#4561) * Update pytest from 7.4.0 to 7.4.1 * Update pytest from 7.4.0 to 7.4.1 --- 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 eeb5cba72..019537110 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ pre-commit==3.4.0 # Testing # ------------------------------------------------------------------------------ tox==4.11.1 -pytest==7.4.0 +pytest==7.4.1 pytest-xdist==3.3.1 pytest-cookies==0.7.0 pytest-instafail==0.5.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 4c8568565..bb125cc4b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.20.0 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ mypy==1.4.1 # https://github.com/python/mypy django-stubs[compatible-mypy]==4.2.3 # https://github.com/typeddjango/django-stubs -pytest==7.4.0 # https://github.com/pytest-dev/pytest +pytest==7.4.1 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.7 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs[compatible-mypy]==3.14.2 # https://github.com/typeddjango/djangorestframework-stubs From 4940fdd79f45154d1230ecea779c468355a20e5d Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 3 Sep 2023 02:10:29 +0000 Subject: [PATCH 080/120] Release 2023.09.02 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b99ab0045..fd0bb2162 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.09.02 + + +### Updated + +- Update pytest to 7.4.1 ([#4561](https://github.com/cookiecutter/cookiecutter-django/pull/4561)) + +- Update pre-commit to 3.4.0 ([#4560](https://github.com/cookiecutter/cookiecutter-django/pull/4560)) + +- Update django-environ to 0.11.2 ([#4558](https://github.com/cookiecutter/cookiecutter-django/pull/4558)) + ## 2023.09.01 diff --git a/setup.py b/setup.py index b0f11511b..ec68126a1 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.01" +version = "2023.09.02" with open("README.md") as readme_file: long_description = readme_file.read() From c7cbd19be801447d625c6df98117d1d7fe757bab Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 3 Sep 2023 17:08:14 -0500 Subject: [PATCH 081/120] Update celery from 5.3.3 to 5.3.4 (#4562) --- {{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 88c9af455..e23e07aa1 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -16,7 +16,7 @@ redis==5.0.0 # https://github.com/redis/redis-py hiredis==2.2.3 # https://github.com/redis/hiredis-py {%- endif %} {%- if cookiecutter.use_celery == "y" %} -celery==5.3.3 # pyup: < 6.0 # https://github.com/celery/celery +celery==5.3.4 # pyup: < 6.0 # https://github.com/celery/celery django-celery-beat==2.5.0 # https://github.com/celery/django-celery-beat {%- if cookiecutter.use_docker == 'y' %} flower==2.0.1 # https://github.com/mher/flower From 80883a5aab80a2705ab8cd287e556d7b0a45e908 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 4 Sep 2023 02:10:33 +0000 Subject: [PATCH 082/120] Release 2023.09.03 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd0bb2162..aba5b3c5c 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.09.03 + + +### Updated + +- Update celery to 5.3.4 ([#4562](https://github.com/cookiecutter/cookiecutter-django/pull/4562)) + ## 2023.09.02 diff --git a/setup.py b/setup.py index ec68126a1..586e516fe 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.02" +version = "2023.09.03" with open("README.md") as readme_file: long_description = readme_file.read() From 9d6c754c63c711b280a8b654904c3d71aa335dad Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 4 Sep 2023 11:17:39 -0500 Subject: [PATCH 083/120] Update django from 4.2.4 to 4.2.5 (#4563) --- {{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 e23e07aa1..6ab01b791 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -28,7 +28,7 @@ uvicorn[standard]==0.23.2 # https://github.com/encode/uvicorn # Django # ------------------------------------------------------------------------------ -django==4.2.4 # pyup: < 5.0 # https://www.djangoproject.com/ +django==4.2.5 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils django-allauth==0.55.2 # https://github.com/pennersr/django-allauth From 907d1b9b2630443966117e3c7383cb64b0799683 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 5 Sep 2023 02:09:23 +0000 Subject: [PATCH 084/120] Release 2023.09.04 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aba5b3c5c..291d8d6cb 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.09.04 + + +### Updated + +- Update django to 4.2.5 ([#4563](https://github.com/cookiecutter/cookiecutter-django/pull/4563)) + ## 2023.09.03 diff --git a/setup.py b/setup.py index 586e516fe..2e5573a2a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.03" +version = "2023.09.04" with open("README.md") as readme_file: long_description = readme_file.read() From 835c824e259b67f8763e29176474e148b0dae05d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 6 Sep 2023 14:13:07 -0500 Subject: [PATCH 085/120] Update coverage from 7.3.0 to 7.3.1 (#4567) --- {{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 bb125cc4b..34f384467 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.1.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort -coverage==7.3.0 # https://github.com/nedbat/coveragepy +coverage==7.3.1 # https://github.com/nedbat/coveragepy black==23.7.0 # https://github.com/psf/black djlint==1.32.1 # https://github.com/Riverside-Healthcare/djLint pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django From b2c2eedb6d6804ed67ca187e0014a6dc80d04247 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 20:40:35 +0100 Subject: [PATCH 086/120] Bump actions/checkout from 3 to 4 (#4565) * Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Bump actions/checkout from 3 to 4 --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bruno Alla --- .github/workflows/ci.yml | 6 +++--- .github/workflows/django-issue-checker.yml | 2 +- .github/workflows/pre-commit-autoupdate.yml | 2 +- .github/workflows/update-changelog.yml | 2 +- .github/workflows/update-contributors.yml | 2 +- {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ff9f06aa..17510ae25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: name: "pytest ${{ matrix.os }}" runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.11" @@ -53,7 +53,7 @@ jobs: COMPOSE_DOCKER_CLI_BUILD: 1 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.11" @@ -97,7 +97,7 @@ jobs: DATABASE_URL: "postgres://postgres:postgres@localhost:5432/postgres" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.11" diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml index cbfea922d..a926f7513 100644 --- a/.github/workflows/django-issue-checker.yml +++ b/.github/workflows/django-issue-checker.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.11" diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml index 75bfe0a20..67fe9f94a 100644 --- a/.github/workflows/pre-commit-autoupdate.yml +++ b/.github/workflows/pre-commit-autoupdate.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.11" diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml index f48f297aa..eb037b675 100644 --- a/.github/workflows/update-changelog.yml +++ b/.github/workflows/update-changelog.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml index 78d72c241..9b93ef6f1 100644 --- a/.github/workflows/update-contributors.yml +++ b/.github/workflows/update-contributors.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml index 3a863ccb9..e39933fe1 100644 --- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml +++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Code Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 @@ -65,7 +65,7 @@ jobs: steps: - name: Checkout Code Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 {%- if cookiecutter.use_docker == 'y' %} - name: Build the Stack From 73137e17644ef2bb31f72f6166824c8bbcfa6396 Mon Sep 17 00:00:00 2001 From: Vageeshan Mankala <43883923+vagi8@users.noreply.github.com> Date: Wed, 6 Sep 2023 12:41:01 -0700 Subject: [PATCH 087/120] Replace Mailhog with Mailpit (#4551) * modifying cookiecutter.json with new config * updated docker image and its local settings * replacing use_mailhog conditions * replacing use_mailhog condition in docs * Updating docs with mailpit --- README.md | 4 +-- cookiecutter.json | 2 +- docs/developing-locally-docker.rst | 8 +++--- docs/developing-locally.rst | 20 +++++++------- docs/project-generation-options.rst | 6 ++--- tests/test_cookiecutter_generation.py | 4 +-- {{cookiecutter.project_slug}}/.gitignore | 4 +-- {{cookiecutter.project_slug}}/README.md | 26 +++++++++---------- .../config/settings/local.py | 6 ++--- {{cookiecutter.project_slug}}/local.yml | 20 +++++++------- 10 files changed, 48 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index 7f2c358e7..c9d3d3489 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ _These features can be enabled during initial project setup._ - Serve static files from Amazon S3, Google Cloud Storage, Azure Storage or [Whitenoise](https://whitenoise.readthedocs.io/) - Configuration for [Celery](https://docs.celeryq.dev) and [Flower](https://github.com/mher/flower) (the latter in Docker setup only) -- Integration with [MailHog](https://github.com/mailhog/MailHog) for local email testing +- Integration with [Mailpit](https://github.com/axllent/mailpit/) for local email testing - Integration with [Sentry](https://sentry.io/welcome/) for error logging ## Constraints @@ -165,7 +165,7 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re 4 - Webpack Choose from 1, 2, 3, 4 [1]: 1 use_celery [n]: y - use_mailhog [n]: n + use_mailpit [n]: n use_sentry [n]: y use_whitenoise [n]: n use_heroku [n]: y diff --git a/cookiecutter.json b/cookiecutter.json index f66e281f5..e343617d1 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -35,7 +35,7 @@ "use_drf": "n", "frontend_pipeline": ["None", "Django Compressor", "Gulp", "Webpack"], "use_celery": "n", - "use_mailhog": "n", + "use_mailpit": "n", "use_sentry": "n", "use_whitenoise": "n", "use_heroku": "n", diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index 6af4fe7c2..a8f945adf 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -191,16 +191,16 @@ The ``container_name`` from the yml file can be used to check on containers with Notice that the ``container_name`` is generated dynamically using your project slug as a prefix -Mailhog +Mailpit ~~~~~~~ -When developing locally you can go with MailHog_ for email testing provided ``use_mailhog`` was set to ``y`` on setup. To proceed, +When developing locally you can go with Mailpit_ for email testing provided ``use_mailpit`` was set to ``y`` on setup. To proceed, -#. make sure ``_local_mailhog`` container is up and running; +#. make sure ``_local_mailpit`` container is up and running; #. open up ``http://127.0.0.1:8025``. -.. _Mailhog: https://github.com/mailhog/MailHog/ +.. _Mailpit: https://github.com/axllent/mailpit/ .. _`CeleryTasks`: diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst index 88c8b3206..92379f4fd 100644 --- a/docs/developing-locally.rst +++ b/docs/developing-locally.rst @@ -99,39 +99,37 @@ First things first. Setup Email Backend ------------------- -MailHog +Mailpit ~~~~~~~ -.. note:: In order for the project to support MailHog_ it must have been bootstrapped with ``use_mailhog`` set to ``y``. +.. note:: In order for the project to support Mailpit_ it must have been bootstrapped with ``use_mailpit`` set to ``y``. -MailHog is used to receive emails during development, it is written in Go and has no external dependencies. +Mailpit is used to receive emails during development, it is written in Go and has no external dependencies. For instance, one of the packages we depend upon, ``django-allauth`` sends verification emails to new users signing up as well as to the existing ones who have not yet verified themselves. -#. `Download the latest MailHog release`_ for your OS. +#. `Download the latest Mailpit release`_ for your OS. -#. Rename the build to ``MailHog``. - -#. Copy the file to the project root. +#. Copy the binary file to the project root. #. Make it executable: :: - $ chmod +x MailHog + $ chmod +x mailpit #. Spin up another terminal window and start it there: :: - ./MailHog + ./mailpit #. Check out ``_ to see how it goes. Now you have your own mail server running locally, ready to receive whatever you send it. -.. _`Download the latest MailHog release`: https://github.com/mailhog/MailHog +.. _`Download the latest Mailpit release`: https://github.com/axllent/mailpit Console ~~~~~~~ -.. note:: If you have generated your project with ``use_mailhog`` set to ``n`` this will be a default setup. +.. note:: If you have generated your project with ``use_mailpit`` set to ``n`` this will be a default setup. Alternatively, deliver emails over console via ``EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'``. diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst index bd368ae84..967b42426 100644 --- a/docs/project-generation-options.rst +++ b/docs/project-generation-options.rst @@ -115,8 +115,8 @@ Both Gulp and Webpack support Bootstrap recompilation with real-time variables a use_celery: Indicates whether the project should be configured to use Celery_. -use_mailhog: - Indicates whether the project should be configured to use MailHog_. +use_mailpit: + Indicates whether the project should be configured to use Mailpit_. use_sentry: Indicates whether the project should be configured to use Sentry_. @@ -185,7 +185,7 @@ debug: .. _Celery: https://github.com/celery/celery -.. _MailHog: https://github.com/mailhog/MailHog +.. _Mailpit: https://github.com/axllent/mailpit .. _Sentry: https://github.com/getsentry/sentry diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py index 87e52ef01..31d006bed 100755 --- a/tests/test_cookiecutter_generation.py +++ b/tests/test_cookiecutter_generation.py @@ -115,8 +115,8 @@ SUPPORTED_COMBINATIONS = [ {"frontend_pipeline": "Webpack"}, {"use_celery": "y"}, {"use_celery": "n"}, - {"use_mailhog": "y"}, - {"use_mailhog": "n"}, + {"use_mailpit": "y"}, + {"use_mailpit": "n"}, {"use_sentry": "y"}, {"use_sentry": "n"}, {"use_whitenoise": "y"}, diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore index 541f40846..0bb322186 100644 --- a/{{cookiecutter.project_slug}}/.gitignore +++ b/{{cookiecutter.project_slug}}/.gitignore @@ -329,8 +329,8 @@ tags dump.rdb ### Project template -{%- if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %} -MailHog +{%- if cookiecutter.use_mailpit == 'y' and cookiecutter.use_docker == 'n' %} +mailpit {%- endif %} {{ cookiecutter.project_slug }}/media/ diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md index 56853f8f7..ccf245a2f 100644 --- a/{{cookiecutter.project_slug}}/README.md +++ b/{{cookiecutter.project_slug}}/README.md @@ -78,37 +78,35 @@ celery -A config.celery_app worker -B -l info ``` {%- endif %} -{%- if cookiecutter.use_mailhog == "y" %} +{%- if cookiecutter.use_mailpit == "y" %} ### Email Server {%- if cookiecutter.use_docker == "y" %} -In development, it is often nice to be able to see emails that are being sent from your application. For that reason local SMTP server [MailHog](https://github.com/mailhog/MailHog) with a web interface is available as docker container. +In development, it is often nice to be able to see emails that are being sent from your application. For that reason local SMTP server [Mailpit](https://github.com/axllent/mailpit) with a web interface is available as docker container. -Container mailhog will start automatically when you will run all docker containers. +Container mailpit will start automatically when you will run all docker containers. Please check [cookiecutter-django Docker documentation](http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-docker.html) for more details how to start all containers. -With MailHog running, to view messages that are sent by your application, open your browser and go to `http://127.0.0.1:8025` +With Mailpit running, to view messages that are sent by your application, open your browser and go to `http://127.0.0.1:8025` {%- else %} -In development, it is often nice to be able to see emails that are being sent from your application. If you choose to use [MailHog](https://github.com/mailhog/MailHog) when generating the project a local SMTP server with a web interface will be available. +In development, it is often nice to be able to see emails that are being sent from your application. If you choose to use [Mailpit](https://github.com/axllent/mailpit) when generating the project a local SMTP server with a web interface will be available. -1. [Download the latest MailHog release](https://github.com/mailhog/MailHog/releases) for your OS. +1. [Download the latest Mailpit release](https://github.com/axllent/mailpit/releases) for your OS. -2. Rename the build to `MailHog`. +2. Copy the binary file to the project root. -3. Copy the file to the project root. +3. Make it executable: -4. Make it executable: + $ chmod +x mailpit - $ chmod +x MailHog +4. Spin up another terminal window and start it there: -5. Spin up another terminal window and start it there: + ./mailpit - ./MailHog - -6. Check out to see how it goes. +5. Check out to see how it goes. Now you have your own mail server running locally, ready to receive whatever you send it. diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py index adab6087a..0304d6cd4 100644 --- a/{{cookiecutter.project_slug}}/config/settings/local.py +++ b/{{cookiecutter.project_slug}}/config/settings/local.py @@ -25,12 +25,12 @@ CACHES = { # EMAIL # ------------------------------------------------------------------------------ -{% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'y' -%} +{% if cookiecutter.use_mailpit == 'y' and cookiecutter.use_docker == 'y' -%} # https://docs.djangoproject.com/en/dev/ref/settings/#email-host -EMAIL_HOST = env("EMAIL_HOST", default="mailhog") +EMAIL_HOST = env("EMAIL_HOST", default="mailpit") # https://docs.djangoproject.com/en/dev/ref/settings/#email-port EMAIL_PORT = 1025 -{%- elif cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' -%} +{%- elif cookiecutter.use_mailpit == 'y' and cookiecutter.use_docker == 'n' -%} # https://docs.djangoproject.com/en/dev/ref/settings/#email-host EMAIL_HOST = "localhost" # https://docs.djangoproject.com/en/dev/ref/settings/#email-port diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml index e55e18d32..692d87499 100644 --- a/{{cookiecutter.project_slug}}/local.yml +++ b/{{cookiecutter.project_slug}}/local.yml @@ -16,8 +16,8 @@ services: {%- if cookiecutter.use_celery == 'y' %} - redis {%- endif %} - {%- if cookiecutter.use_mailhog == 'y' %} - - mailhog + {%- if cookiecutter.use_mailpit == 'y' %} + - mailpit {%- endif %} volumes: - .:/app:z @@ -55,11 +55,11 @@ services: ports: - '9000:9000' command: /start-docs - {%- if cookiecutter.use_mailhog == 'y' %} + {%- if cookiecutter.use_mailpit == 'y' %} - mailhog: - image: mailhog/mailhog:v1.0.0 - container_name: {{ cookiecutter.project_slug }}_local_mailhog + mailpit: + image: axllent/mailpit:v1.8 + container_name: {{ cookiecutter.project_slug }}_local_mailpit ports: - "8025:8025" @@ -77,8 +77,8 @@ services: depends_on: - redis - postgres - {%- if cookiecutter.use_mailhog == 'y' %} - - mailhog + {%- if cookiecutter.use_mailpit == 'y' %} + - mailpit {%- endif %} ports: [] command: /start-celeryworker @@ -90,8 +90,8 @@ services: depends_on: - redis - postgres - {%- if cookiecutter.use_mailhog == 'y' %} - - mailhog + {%- if cookiecutter.use_mailpit == 'y' %} + - mailpit {%- endif %} ports: [] command: /start-celerybeat From 243250f8c79853984c6694449c42c01c54d44a7a Mon Sep 17 00:00:00 2001 From: browniebroke Date: Wed, 6 Sep 2023 19:41:51 +0000 Subject: [PATCH 088/120] 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 fab5e5f56..bccbb725f 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1463,5 +1463,10 @@ "name": "itisnotyourenv", "github_login": "itisnotyourenv", "twitter_username": "" + }, + { + "name": "Vageeshan Mankala", + "github_login": "vagi8", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 1e7bfd7ac..f7615c108 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1944,6 +1944,13 @@ Listed in alphabetical order. egregors + + Vageeshan Mankala + + vagi8 + + + vascop From a9ce921eccece5cfd8b3b9350e4a017ec115d1e0 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 6 Sep 2023 15:47:35 -0500 Subject: [PATCH 089/120] Update sphinx-rtd-theme from 1.2.2 to 1.3.0 (#4570) --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index d06b651b3..8c93d47f2 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ sphinx==6.2.1 -sphinx-rtd-theme==1.2.2 +sphinx-rtd-theme==1.3.0 myst-parser==2.0.0 From 402ee60f421df26e2b51850747525072c6632745 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 6 Sep 2023 16:18:05 -0500 Subject: [PATCH 090/120] Update sphinx to 7.2.5 (#4569) * Update sphinx from 6.2.1 to 7.2.5 * Update sphinx from 6.2.1 to 7.2.5 --------- Co-authored-by: Bruno Alla --- docs/requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 8c93d47f2..0e96d112b 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==6.2.1 +sphinx==7.2.5 sphinx-rtd-theme==1.3.0 myst-parser==2.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 34f384467..c1d4adad4 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs[compatible-mypy]==3.14.2 # https://github.com/typeddj # Documentation # ------------------------------------------------------------------------------ -sphinx==6.2.1 # https://github.com/sphinx-doc/sphinx +sphinx==7.2.5 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From c19e68b772048294cfcf26c5def1b3418d186d49 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 7 Sep 2023 02:09:55 +0000 Subject: [PATCH 091/120] Release 2023.09.06 --- CHANGELOG.md | 15 +++++++++++++++ setup.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 291d8d6cb..9092f8b86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.09.06 + + +### Changed + +- Replace Mailhog with Mailpit ([#4551](https://github.com/cookiecutter/cookiecutter-django/pull/4551)) + +### Updated + +- Update sphinx to 7.2.5 ([#4569](https://github.com/cookiecutter/cookiecutter-django/pull/4569)) + +- Bump actions/checkout from 3 to 4 ([#4565](https://github.com/cookiecutter/cookiecutter-django/pull/4565)) + +- Update coverage to 7.3.1 ([#4567](https://github.com/cookiecutter/cookiecutter-django/pull/4567)) + ## 2023.09.04 diff --git a/setup.py b/setup.py index 2e5573a2a..1b94c53e8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.04" +version = "2023.09.06" with open("README.md") as readme_file: long_description = readme_file.read() From ea2e63aaa598c54af430535c4b182a0f994ed86a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 7 Sep 2023 14:04:24 -0500 Subject: [PATCH 092/120] Update gitpython from 3.1.34 to 3.1.35 (#4572) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 019537110..417d17386 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,6 +23,6 @@ pyyaml==6.0.1 # Scripting # ------------------------------------------------------------------------------ PyGithub==1.59.1 -gitpython==3.1.34 +gitpython==3.1.35 jinja2==3.1.2 requests==2.31.0 From e389c0b554c5d3b096958a70385dc613ed4a72a5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 7 Sep 2023 14:19:19 -0500 Subject: [PATCH 093/120] Update django-allauth to 0.56.0 (#4571) * Update django-allauth from 0.55.2 to 0.56.0 * Add required allauth middleware --------- Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/config/settings/base.py | 1 + {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 688713313..331ff06e2 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -161,6 +161,7 @@ MIDDLEWARE = [ "django.contrib.auth.middleware.AuthenticationMiddleware", "django.contrib.messages.middleware.MessageMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", + "allauth.account.middleware.AccountMiddleware", ] # STATIC diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 6ab01b791..ad8cc8351 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -31,7 +31,7 @@ uvicorn[standard]==0.23.2 # https://github.com/encode/uvicorn django==4.2.5 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils -django-allauth==0.55.2 # https://github.com/pennersr/django-allauth +django-allauth==0.56.0 # https://github.com/pennersr/django-allauth django-crispy-forms==2.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' %} From 495886dd2ee3ee68ea8f43bc74a9e439a95a0f3f Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 8 Sep 2023 02:10:17 +0000 Subject: [PATCH 094/120] Release 2023.09.07 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9092f8b86..8673490d0 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.09.07 + + +### Updated + +- Update django-allauth to 0.56.0 ([#4571](https://github.com/cookiecutter/cookiecutter-django/pull/4571)) + ## 2023.09.06 diff --git a/setup.py b/setup.py index 1b94c53e8..4e83f9ff1 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.06" +version = "2023.09.07" with open("README.md") as readme_file: long_description = readme_file.read() From 89540df1bfa1e1f7d46d4923a2bfa2d16b209f8a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 8 Sep 2023 04:04:36 -0500 Subject: [PATCH 095/120] Update pytest to 7.4.2 (#4573) * Update pytest from 7.4.1 to 7.4.2 * Update pytest from 7.4.1 to 7.4.2 --- 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 417d17386..141fb85a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ pre-commit==3.4.0 # Testing # ------------------------------------------------------------------------------ tox==4.11.1 -pytest==7.4.1 +pytest==7.4.2 pytest-xdist==3.3.1 pytest-cookies==0.7.0 pytest-instafail==0.5.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index c1d4adad4..804aed8f0 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -15,7 +15,7 @@ watchfiles==0.20.0 # https://github.com/samuelcolvin/watchfiles # ------------------------------------------------------------------------------ mypy==1.4.1 # https://github.com/python/mypy django-stubs[compatible-mypy]==4.2.3 # https://github.com/typeddjango/django-stubs -pytest==7.4.1 # https://github.com/pytest-dev/pytest +pytest==7.4.2 # https://github.com/pytest-dev/pytest pytest-sugar==0.9.7 # https://github.com/Frozenball/pytest-sugar {%- if cookiecutter.use_drf == "y" %} djangorestframework-stubs[compatible-mypy]==3.14.2 # https://github.com/typeddjango/djangorestframework-stubs From e27454a2167b4bd2d7065f3606b690e66d8a9f6d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 8 Sep 2023 05:39:35 -0500 Subject: [PATCH 096/120] Update tox to 4.11.2 (#4575) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 141fb85a1..6279a88f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==3.4.0 # Testing # ------------------------------------------------------------------------------ -tox==4.11.1 +tox==4.11.2 pytest==7.4.2 pytest-xdist==3.3.1 pytest-cookies==0.7.0 From 99c909df70ea587d7a33d2253e722f4a2f1f8ec0 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 9 Sep 2023 02:08:06 +0000 Subject: [PATCH 097/120] Release 2023.09.08 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8673490d0..6bfa22fbd 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.09.08 + + +### Updated + +- Update pytest to 7.4.2 ([#4573](https://github.com/cookiecutter/cookiecutter-django/pull/4573)) + ## 2023.09.07 diff --git a/setup.py b/setup.py index 4e83f9ff1..c1e6a6468 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.07" +version = "2023.09.08" with open("README.md") as readme_file: long_description = readme_file.read() From f36641f0eb9d1aea90a4aa015fccb037b8666702 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 11 Sep 2023 05:38:11 -0500 Subject: [PATCH 098/120] Update django-allauth from 0.56.0 to 0.56.1 (#4576) --- {{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 ad8cc8351..61660121b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -31,7 +31,7 @@ uvicorn[standard]==0.23.2 # https://github.com/encode/uvicorn django==4.2.5 # pyup: < 5.0 # https://www.djangoproject.com/ django-environ==0.11.2 # https://github.com/joke2k/django-environ django-model-utils==4.3.1 # https://github.com/jazzband/django-model-utils -django-allauth==0.56.0 # https://github.com/pennersr/django-allauth +django-allauth==0.56.1 # https://github.com/pennersr/django-allauth django-crispy-forms==2.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' %} From 97219510eeaefebc93494c25748b5f36a5c78a13 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 11 Sep 2023 05:38:23 -0500 Subject: [PATCH 099/120] Update tox from 4.11.2 to 4.11.3 (#4577) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6279a88f7..107b07989 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ pre-commit==3.4.0 # Testing # ------------------------------------------------------------------------------ -tox==4.11.2 +tox==4.11.3 pytest==7.4.2 pytest-xdist==3.3.1 pytest-cookies==0.7.0 From 6664ab89161db5612a3ea81ea38cfa879003de98 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 11 Sep 2023 05:38:33 -0500 Subject: [PATCH 100/120] Update black to 23.9.1 (#4580) * Update black from 23.7.0 to 23.9.1 * Update black from 23.7.0 to 23.9.1 --- 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 107b07989..1144741f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ binaryornot==0.4.4 # Code quality # ------------------------------------------------------------------------------ -black==23.7.0 +black==23.9.1 isort==5.12.0 flake8==6.1.0 django-upgrade==1.14.1 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 804aed8f0..349ddb423 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild flake8==6.1.0 # https://github.com/PyCQA/flake8 flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort coverage==7.3.1 # https://github.com/nedbat/coveragepy -black==23.7.0 # https://github.com/psf/black +black==23.9.1 # https://github.com/psf/black djlint==1.32.1 # https://github.com/Riverside-Healthcare/djLint pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} From c78becfd6741b94bd8d693864b4455bfe371ffad Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 11:38:43 +0100 Subject: [PATCH 101/120] Auto-update pre-commit hooks (#4579) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6243406b0..01032aec5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -30,7 +30,7 @@ repos: exclude: hooks/ - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 23.9.1 hooks: - id: black diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 2a03db795..fb249f2c0 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -37,7 +37,7 @@ repos: args: [--py311-plus] - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 23.9.1 hooks: - id: black From 9e8e87c39b459b14370fcbfcd6d174be82c56bcf Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 12 Sep 2023 02:09:18 +0000 Subject: [PATCH 102/120] Release 2023.09.11 --- CHANGELOG.md | 11 +++++++++++ setup.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bfa22fbd..388bf0622 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.09.11 + + +### Updated + +- Auto-update pre-commit hooks ([#4579](https://github.com/cookiecutter/cookiecutter-django/pull/4579)) + +- Update black to 23.9.1 ([#4580](https://github.com/cookiecutter/cookiecutter-django/pull/4580)) + +- Update django-allauth to 0.56.1 ([#4576](https://github.com/cookiecutter/cookiecutter-django/pull/4576)) + ## 2023.09.08 diff --git a/setup.py b/setup.py index c1e6a6468..59d68a8c8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.08" +version = "2023.09.11" with open("README.md") as readme_file: long_description = readme_file.read() From c27a9a84543971a9e7a5d3235714575ed8e72bcc Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 12 Sep 2023 06:07:28 -0500 Subject: [PATCH 103/120] Update django-storages to 1.14 (#4564) * Update django-storages from 1.13.2 to 1.14 * Update django-storages from 1.13.2 to 1.14 * Update django-storages from 1.13.2 to 1.14 * Migrate to new namespace for S3 Storage class * Update extra require for django-storages * Rename our subclasses for S3Storage to match parent naming * Remove "Root" in our own storage class names --------- Co-authored-by: Bruno Alla Co-authored-by: Bruno Alla --- .../config/settings/production.py | 12 ++++++------ .../requirements/production.txt | 6 +++--- .../utils/storages.py | 14 +++++++------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 87340b88a..971efa396 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -109,28 +109,28 @@ AZURE_CONTAINER = env("DJANGO_AZURE_CONTAINER_NAME") {% if cookiecutter.use_whitenoise == 'y' -%} STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage" {% elif cookiecutter.cloud_provider == 'AWS' -%} -STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootS3Boto3Storage" +STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticS3Storage" COLLECTFAST_STRATEGY = "collectfast.strategies.boto3.Boto3Strategy" STATIC_URL = f"https://{aws_s3_domain}/static/" {% elif cookiecutter.cloud_provider == 'GCP' -%} -STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootGoogleCloudStorage" +STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticGoogleCloudStorage" COLLECTFAST_STRATEGY = "collectfast.strategies.gcloud.GoogleCloudStrategy" STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/" {% elif cookiecutter.cloud_provider == 'Azure' -%} -STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootAzureStorage" +STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticAzureStorage" STATIC_URL = f"https://{AZURE_ACCOUNT_NAME}.blob.core.windows.net/static/" {% endif -%} # MEDIA # ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} -DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootS3Boto3Storage" +DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaS3Storage" MEDIA_URL = f"https://{aws_s3_domain}/media/" {%- elif cookiecutter.cloud_provider == 'GCP' %} -DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootGoogleCloudStorage" +DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaGoogleCloudStorage" MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/" {%- elif cookiecutter.cloud_provider == 'Azure' %} -DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootAzureStorage" +DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaAzureStorage" MEDIA_URL = f"https://{AZURE_ACCOUNT_NAME}.blob.core.windows.net/media/" {%- endif %} diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index f04c04ffb..5c53bf111 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -17,11 +17,11 @@ hiredis==2.2.3 # https://github.com/redis/hiredis-py # Django # ------------------------------------------------------------------------------ {%- if cookiecutter.cloud_provider == 'AWS' %} -django-storages[boto3]==1.13.2 # https://github.com/jschneier/django-storages +django-storages[s3]==1.14 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'GCP' %} -django-storages[google]==1.13.2 # https://github.com/jschneier/django-storages +django-storages[google]==1.14 # https://github.com/jschneier/django-storages {%- elif cookiecutter.cloud_provider == 'Azure' %} -django-storages[azure]==1.13.2 # https://github.com/jschneier/django-storages +django-storages[azure]==1.14 # https://github.com/jschneier/django-storages {%- endif %} {%- if cookiecutter.mail_service == 'Mailgun' %} django-anymail[mailgun]==10.1 # https://github.com/anymail/django-anymail diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py index 27595ad1a..cc055378a 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py @@ -1,36 +1,36 @@ {% if cookiecutter.cloud_provider == 'AWS' -%} -from storages.backends.s3boto3 import S3Boto3Storage +from storages.backends.s3 import S3Storage -class StaticRootS3Boto3Storage(S3Boto3Storage): +class StaticS3Storage(S3Storage): location = "static" default_acl = "public-read" -class MediaRootS3Boto3Storage(S3Boto3Storage): +class MediaS3Storage(S3Storage): location = "media" file_overwrite = False {%- elif cookiecutter.cloud_provider == 'GCP' -%} from storages.backends.gcloud import GoogleCloudStorage -class StaticRootGoogleCloudStorage(GoogleCloudStorage): +class StaticGoogleCloudStorage(GoogleCloudStorage): location = "static" default_acl = "publicRead" -class MediaRootGoogleCloudStorage(GoogleCloudStorage): +class MediaGoogleCloudStorage(GoogleCloudStorage): location = "media" file_overwrite = False {%- elif cookiecutter.cloud_provider == 'Azure' -%} from storages.backends.azure_storage import AzureStorage -class StaticRootAzureStorage(AzureStorage): +class StaticAzureStorage(AzureStorage): location = "static" -class MediaRootAzureStorage(AzureStorage): +class MediaAzureStorage(AzureStorage): location = "media" file_overwrite = False {%- endif %} From 3709c9ce6c597613e9403d0ae21ba5047dc068f0 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 12 Sep 2023 06:07:39 -0500 Subject: [PATCH 104/120] Update gitpython to 3.1.36 (#4581) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1144741f3..6a5062d4c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,6 +23,6 @@ pyyaml==6.0.1 # Scripting # ------------------------------------------------------------------------------ PyGithub==1.59.1 -gitpython==3.1.35 +gitpython==3.1.36 jinja2==3.1.2 requests==2.31.0 From 77ce7d61889c452313970efb42916649c1f77434 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 13 Sep 2023 02:10:36 +0000 Subject: [PATCH 105/120] Release 2023.09.12 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 388bf0622..328cb9e9a 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.09.12 + + +### Updated + +- Update django-storages to 1.14 ([#4564](https://github.com/cookiecutter/cookiecutter-django/pull/4564)) + ## 2023.09.11 diff --git a/setup.py b/setup.py index 59d68a8c8..84e85cb74 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.11" +version = "2023.09.12" with open("README.md") as readme_file: long_description = readme_file.read() From fe45f20106e1d91cfe673decca169891e46c465b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 13 Sep 2023 13:09:31 -0500 Subject: [PATCH 106/120] Update sentry-sdk from 1.30.0 to 1.31.0 (#4582) --- {{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 5c53bf111..ecbb34799 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg[c]==3.1.9 # https://github.com/psycopg/psycopg Collectfast==2.2.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==1.30.0 # https://github.com/getsentry/sentry-python +sentry-sdk==1.31.0 # https://github.com/getsentry/sentry-python {%- endif %} {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %} hiredis==2.2.3 # https://github.com/redis/hiredis-py From d37a448485c4882bd1d0fda6022df9a928cf41b5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Thu, 14 Sep 2023 02:09:46 +0000 Subject: [PATCH 107/120] Release 2023.09.13 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 328cb9e9a..c96ce4d56 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.09.13 + + +### Updated + +- Update sentry-sdk to 1.31.0 ([#4582](https://github.com/cookiecutter/cookiecutter-django/pull/4582)) + ## 2023.09.12 diff --git a/setup.py b/setup.py index 84e85cb74..b41bc2773 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.12" +version = "2023.09.13" with open("README.md") as readme_file: long_description = readme_file.read() From 17f9c270d3719f77de9cb303fa1c09bf5236f6d4 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 14 Sep 2023 05:58:53 -0500 Subject: [PATCH 108/120] Update sphinx to 7.2.6 (#4583) * Update sphinx from 7.2.5 to 7.2.6 * Update sphinx from 7.2.5 to 7.2.6 --- docs/requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 0e96d112b..38a8385fd 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,3 @@ -sphinx==7.2.5 +sphinx==7.2.6 sphinx-rtd-theme==1.3.0 myst-parser==2.0.0 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 349ddb423..af0520999 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -23,7 +23,7 @@ djangorestframework-stubs[compatible-mypy]==3.14.2 # https://github.com/typeddj # Documentation # ------------------------------------------------------------------------------ -sphinx==7.2.5 # https://github.com/sphinx-doc/sphinx +sphinx==7.2.6 # https://github.com/sphinx-doc/sphinx sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality From cd49641848d73f1ee6664a2a96a096afa0d6c2d8 Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 15 Sep 2023 02:11:12 +0000 Subject: [PATCH 109/120] Release 2023.09.14 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c96ce4d56..6a4a50be0 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.09.14 + + +### Updated + +- Update sphinx to 7.2.6 ([#4583](https://github.com/cookiecutter/cookiecutter-django/pull/4583)) + ## 2023.09.13 diff --git a/setup.py b/setup.py index b41bc2773..f97d8c915 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.13" +version = "2023.09.14" with open("README.md") as readme_file: long_description = readme_file.read() From 0918491894b7da71263273b9377f6d0108f7bbfd Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 15 Sep 2023 15:07:56 -0500 Subject: [PATCH 110/120] Update pillow to 10.0.1 (#4584) --- {{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 61660121b..94c3d16b7 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -1,5 +1,5 @@ python-slugify==8.0.1 # https://github.com/un33k/python-slugify -Pillow==10.0.0 # https://github.com/python-pillow/Pillow +Pillow==10.0.1 # 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 From 739ebaa43a5cf22276527d78d3941b9817d16a8d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 15 Sep 2023 15:08:15 -0500 Subject: [PATCH 111/120] Update flake8-isort to 6.1.0 (#4585) --- {{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 af0520999..280cf7671 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -29,7 +29,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild # Code quality # ------------------------------------------------------------------------------ flake8==6.1.0 # https://github.com/PyCQA/flake8 -flake8-isort==6.0.0 # https://github.com/gforcada/flake8-isort +flake8-isort==6.1.0 # https://github.com/gforcada/flake8-isort coverage==7.3.1 # https://github.com/nedbat/coveragepy black==23.9.1 # https://github.com/psf/black djlint==1.32.1 # https://github.com/Riverside-Healthcare/djLint From 48f175149ef86773e12671ed62a3310e123ef009 Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 16 Sep 2023 02:08:37 +0000 Subject: [PATCH 112/120] Release 2023.09.15 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a4a50be0..8d8df6c3d 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.09.15 + + +### Updated + +- Update flake8-isort to 6.1.0 ([#4585](https://github.com/cookiecutter/cookiecutter-django/pull/4585)) + +- Update pillow to 10.0.1 ([#4584](https://github.com/cookiecutter/cookiecutter-django/pull/4584)) + ## 2023.09.14 diff --git a/setup.py b/setup.py index f97d8c915..9ef1e561f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.14" +version = "2023.09.15" with open("README.md") as readme_file: long_description = readme_file.read() From 3107807c1516deb62331abe05a0df652e374994f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 16 Sep 2023 14:16:53 +0100 Subject: [PATCH 113/120] Auto-update pre-commit hooks (#4586) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 01032aec5..2e9955ff1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,7 +23,7 @@ repos: args: ["--tab-width", "2"] - repo: https://github.com/asottile/pyupgrade - rev: v3.10.1 + rev: v3.11.0 hooks: - id: pyupgrade args: [--py311-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index fb249f2c0..5ef1d9ee4 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: args: ['--target-version', '4.2'] - repo: https://github.com/asottile/pyupgrade - rev: v3.10.1 + rev: v3.11.0 hooks: - id: pyupgrade args: [--py311-plus] From bac63bdbf0a06e399c96ee48b628fae2d75b6d5e Mon Sep 17 00:00:00 2001 From: github-actions Date: Sun, 17 Sep 2023 02:11:16 +0000 Subject: [PATCH 114/120] Release 2023.09.16 --- CHANGELOG.md | 7 +++++++ setup.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d8df6c3d..80142ce46 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.09.16 + + +### Updated + +- Auto-update pre-commit hooks ([#4586](https://github.com/cookiecutter/cookiecutter-django/pull/4586)) + ## 2023.09.15 diff --git a/setup.py b/setup.py index 9ef1e561f..871b50d2a 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.15" +version = "2023.09.16" with open("README.md") as readme_file: long_description = readme_file.read() From 4e3f84b6105b398c82c4f409ecd7538a679a8c57 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 19 Sep 2023 11:24:27 -0500 Subject: [PATCH 115/120] Update djlint to 1.33.0 (#4587) * Update djlint from 1.32.1 to 1.33.0 * Update djlint from 1.32.1 to 1.33.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 6a5062d4c..960f778bf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==23.9.1 isort==5.12.0 flake8==6.1.0 django-upgrade==1.14.1 -djlint==1.32.1 +djlint==1.33.0 pre-commit==3.4.0 # Testing diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 280cf7671..51653a648 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -32,7 +32,7 @@ flake8==6.1.0 # https://github.com/PyCQA/flake8 flake8-isort==6.1.0 # https://github.com/gforcada/flake8-isort coverage==7.3.1 # https://github.com/nedbat/coveragepy black==23.9.1 # https://github.com/psf/black -djlint==1.32.1 # https://github.com/Riverside-Healthcare/djLint +djlint==1.33.0 # https://github.com/Riverside-Healthcare/djLint 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 From d7116b59a812c46ab96555c59442efcf57257783 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:24:42 +0100 Subject: [PATCH 116/120] Auto-update pre-commit hooks (#4588) Co-authored-by: browniebroke --- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index 5ef1d9ee4..afa59779c 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -52,7 +52,7 @@ repos: - id: flake8 - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.32.1 + rev: v1.33.0 hooks: - id: djlint-reformat-django - id: djlint-django From 160178e95054c23b4aceff0191392ce34118bd1f Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 20 Sep 2023 02:10:29 +0000 Subject: [PATCH 117/120] Release 2023.09.19 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80142ce46..1290fbd99 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.09.19 + + +### Updated + +- Auto-update pre-commit hooks ([#4588](https://github.com/cookiecutter/cookiecutter-django/pull/4588)) + +- Update djlint to 1.33.0 ([#4587](https://github.com/cookiecutter/cookiecutter-django/pull/4587)) + ## 2023.09.16 diff --git a/setup.py b/setup.py index 871b50d2a..d405ff4ba 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.16" +version = "2023.09.19" with open("README.md") as readme_file: long_description = readme_file.read() From 36664905d38a0f9596b03fd0ac24be40ace7b1e5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 21 Sep 2023 07:09:31 -0500 Subject: [PATCH 118/120] Update djlint to 1.34.0 (#4590) * Update djlint from 1.33.0 to 1.34.0 * Update djlint from 1.33.0 to 1.34.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 960f778bf..c98315450 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==23.9.1 isort==5.12.0 flake8==6.1.0 django-upgrade==1.14.1 -djlint==1.33.0 +djlint==1.34.0 pre-commit==3.4.0 # Testing diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 51653a648..5afde2967 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -32,7 +32,7 @@ flake8==6.1.0 # https://github.com/PyCQA/flake8 flake8-isort==6.1.0 # https://github.com/gforcada/flake8-isort coverage==7.3.1 # https://github.com/nedbat/coveragepy black==23.9.1 # https://github.com/psf/black -djlint==1.33.0 # https://github.com/Riverside-Healthcare/djLint +djlint==1.34.0 # https://github.com/Riverside-Healthcare/djLint 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 From a47146f859b0749c43726deb7978519898b547a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 13:09:46 +0100 Subject: [PATCH 119/120] Auto-update pre-commit hooks (#4589) Co-authored-by: browniebroke --- .pre-commit-config.yaml | 2 +- {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2e9955ff1..0327a46f2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,7 +23,7 @@ repos: args: ["--tab-width", "2"] - repo: https://github.com/asottile/pyupgrade - rev: v3.11.0 + rev: v3.11.1 hooks: - id: pyupgrade args: [--py311-plus] diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml index afa59779c..6efcfef9e 100644 --- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml +++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: args: ['--target-version', '4.2'] - repo: https://github.com/asottile/pyupgrade - rev: v3.11.0 + rev: v3.11.1 hooks: - id: pyupgrade args: [--py311-plus] @@ -52,7 +52,7 @@ repos: - id: flake8 - repo: https://github.com/Riverside-Healthcare/djLint - rev: v1.33.0 + rev: v1.34.0 hooks: - id: djlint-reformat-django - id: djlint-django From 38d509c7128093908b53067b597097eddeef19ef Mon Sep 17 00:00:00 2001 From: github-actions Date: Fri, 22 Sep 2023 02:10:27 +0000 Subject: [PATCH 120/120] Release 2023.09.21 --- CHANGELOG.md | 9 +++++++++ setup.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1290fbd99..6dd30cb85 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.09.21 + + +### Updated + +- Auto-update pre-commit hooks ([#4589](https://github.com/cookiecutter/cookiecutter-django/pull/4589)) + +- Update djlint to 1.34.0 ([#4590](https://github.com/cookiecutter/cookiecutter-django/pull/4590)) + ## 2023.09.19 diff --git a/setup.py b/setup.py index d405ff4ba..bd8994171 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.09.19" +version = "2023.09.21" with open("README.md") as readme_file: long_description = readme_file.read()