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/CHANGELOG.md b/CHANGELOG.md
index 85bccefd4..3389bf883 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
+## 2023.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
+- Update pre-commit to 3.0.4 ([#4127](https://github.com/cookiecutter/cookiecutter-django/pull/4127))
+
## 2023.02.02
### Updated
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 |
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
-----------------------------
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/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)
diff --git a/setup.py b/setup.py
index cc0e60d8f..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.02"
+version = "2023.02.05"
with open("README.rst") as readme_file:
long_description = readme_file.read()
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 %}
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
# ------------------------------------------------------------------------------
|