From 3f05da0ee77551520ddbbb4d11681ee6f504dccf Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 3 Feb 2023 13:54:51 -0500 Subject: [PATCH 1/7] Update pre-commit to 3.0.4 (#4127) * Update pre-commit from 3.0.3 to 3.0.4 * Update pre-commit from 3.0.3 to 3.0.4 --- 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 6e458e6be..6c554aaae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ black==23.1.0 isort==5.12.0 flake8==6.0.0 flake8-isort==6.0.0 -pre-commit==3.0.3 +pre-commit==3.0.4 # Testing # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 9a45f5c7e..8905ddb76 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -36,7 +36,7 @@ pylint-django==2.5.3 # https://github.com/PyCQA/pylint-django {%- if cookiecutter.use_celery == 'y' %} pylint-celery==0.3 # https://github.com/PyCQA/pylint-celery {%- endif %} -pre-commit==3.0.3 # https://github.com/pre-commit/pre-commit +pre-commit==3.0.4 # https://github.com/pre-commit/pre-commit # Django # ------------------------------------------------------------------------------ From d4865711ecc231cc3a29930fa7acd490d243c85e Mon Sep 17 00:00:00 2001 From: github-actions Date: Sat, 4 Feb 2023 02:22:36 +0000 Subject: [PATCH 2/7] Release 2023.02.03 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85bccefd4..0451b1ead 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.02.03 + +### Updated +- Update pre-commit to 3.0.4 ([#4127](https://github.com/cookiecutter/cookiecutter-django/pull/4127)) + ## 2023.02.02 ### Updated diff --git a/setup.py b/setup.py index cc0e60d8f..b180a6eca 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.02.02" +version = "2023.02.03" with open("README.rst") as readme_file: long_description = readme_file.read() From 1f300e0ca26285ef541dfa06e185213ba52afb29 Mon Sep 17 00:00:00 2001 From: duffn <3457341+duffn@users.noreply.github.com> Date: Sun, 5 Feb 2023 03:00:28 -0700 Subject: [PATCH 3/7] Add note about which service to request when running locally with Docker & Webpack or Gulp (#4130) * Add note about running Webpack locally with Docker * Add note about running Gulp locally with Docker --- docs/developing-locally-docker.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index a7d77e108..935e86020 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -213,6 +213,11 @@ By default, it's enabled both in local and production environments (``local.yml` .. _`Flower`: https://github.com/mher/flower +Using Webpack or Gulp +~~~~~~~~~~~~~~~~~~~~~ + +When using Webpack or Gulp as the ``frontend_pipeline`` option, you should access your application at the address of the ``node`` service in order to see your correct styles. This is http://localhost:3000 by default. When using any of the other ``frontend_pipeline`` options, you should use the address of the ``django`` service, http://localhost:8000. + Developing locally with HTTPS ----------------------------- From 170cd6fe18e0627354167e29258bdfebe6f53bb1 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sun, 5 Feb 2023 10:01:04 +0000 Subject: [PATCH 4/7] 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 0f923e027..7920e8caf 100644 --- a/.github/contributors.json +++ b/.github/contributors.json @@ -1357,5 +1357,10 @@ "name": "tildebox", "github_login": "tildebox", "twitter_username": "" + }, + { + "name": "duffn", + "github_login": "duffn", + "twitter_username": "" } ] \ No newline at end of file diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 57194bca3..85b1ae88f 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -705,6 +705,13 @@ Listed in alphabetical order. dudanogueira + + duffn + + duffn + + + Dónal Adams From 1f65656dafeb9f3ac8a4a3951afb55b090ac91dd Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 5 Feb 2023 10:03:22 +0000 Subject: [PATCH 5/7] Ignore some changes and group documentation changes into their own section (#4125) --- scripts/update_changelog.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py index b50d25066..57d915a4b 100644 --- a/scripts/update_changelog.py +++ b/scripts/update_changelog.py @@ -82,14 +82,20 @@ def group_pulls_by_change_type( grouped_pulls = { "Changed": [], "Fixed": [], + "Documentation": [], "Updated": [], } for pull in pull_requests_list: label_names = {label.name for label in pull.labels} + if "project infrastructure" in label_names: + # Don't mention it in the changelog + continue if "update" in label_names: group_name = "Updated" elif "bug" in label_names: group_name = "Fixed" + elif "docs" in label_names: + group_name = "Documentation" else: group_name = "Changed" grouped_pulls[group_name].append(pull) From 1de268d87bcd96a54e42c1c3350e512d4b13121d Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 6 Feb 2023 02:25:10 +0000 Subject: [PATCH 6/7] Release 2023.02.05 --- CHANGELOG.md | 5 +++++ setup.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0451b1ead..3389bf883 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f +## 2023.02.05 + +### Documentation +- Add note about which service to request when running locally with Docker & Webpack or Gulp ([#4130](https://github.com/cookiecutter/cookiecutter-django/pull/4130)) + ## 2023.02.03 ### Updated diff --git a/setup.py b/setup.py index b180a6eca..4a45827d8 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ except ImportError: from distutils.core import setup # We use calendar versioning -version = "2023.02.03" +version = "2023.02.05" with open("README.rst") as readme_file: long_description = readme_file.read() From c24fa1f6c4c1de0e50d0a3a7a90b21eb1c1f6282 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 6 Feb 2023 09:46:39 -0500 Subject: [PATCH 7/7] Update django-webpack-loader to 1.8.1 (#4132) --- {{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 0aa17a5f9..865d625e8 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -47,5 +47,5 @@ django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers drf-spectacular==0.25.1 # https://github.com/tfranzel/drf-spectacular {%- endif %} {%- if cookiecutter.frontend_pipeline == 'Webpack' %} -django-webpack-loader==1.8.0 # https://github.com/django-webpack/django-webpack-loader +django-webpack-loader==1.8.1 # https://github.com/django-webpack/django-webpack-loader {%- endif %}