Skip to content

Commit 21d2aaf

Browse files
browniebrokebrowniebroke
committed
Merge branch 'master' into lint-format-template-with-ruff
2 parents 8d5dfd9 + 4c8ab6b commit 21d2aaf

File tree

16 files changed

+108
-155
lines changed

16 files changed

+108
-155
lines changed

‎.github/contributors.json

+5
Original file line numberDiff line numberDiff line change
@@ -1693,5 +1693,10 @@
16931693
"name": "Alan Cyment",
16941694
"github_login": "acyment",
16951695
"twitter_username": ""
1696+
},
1697+
{
1698+
"name": "Kawsar Alam Foysal",
1699+
"github_login": "iamfoysal",
1700+
"twitter_username": ""
16961701
}
16971702
]

‎.github/dependabot.yml

+10-58
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ updates:
3636
- "update"
3737

3838
# Enable version updates for Docker
39-
# We need to specify each Dockerfile in a separate entry because Dependabot doesn't
40-
# support wildcards or recursively checking subdirectories. Check this issue for updates:
41-
# https://github.com/dependabot/dependabot-core/issues/2178
4239
- package-ecosystem: "docker"
43-
directory: "{{cookiecutter.project_slug}}/compose/local/django/"
40+
directories:
41+
- "{{cookiecutter.project_slug}}/compose/local/django/"
42+
- "{{cookiecutter.project_slug}}/compose/local/docs/"
43+
- "{{cookiecutter.project_slug}}/compose/production/django/"
4444
schedule:
4545
interval: "daily"
4646
ignore:
@@ -52,60 +52,12 @@ updates:
5252
- "update"
5353

5454
- package-ecosystem: "docker"
55-
directory: "{{cookiecutter.project_slug}}/compose/local/docs/"
56-
schedule:
57-
interval: "daily"
58-
ignore:
59-
- dependency-name: "*"
60-
update-types:
61-
- "version-update:semver-major"
62-
- "version-update:semver-minor"
63-
labels:
64-
- "update"
65-
66-
- package-ecosystem: "docker"
67-
directory: "{{cookiecutter.project_slug}}/compose/local/node/"
68-
schedule:
69-
interval: "daily"
70-
labels:
71-
- "update"
72-
73-
- package-ecosystem: "docker"
74-
directory: "{{cookiecutter.project_slug}}/compose/production/aws/"
75-
schedule:
76-
interval: "daily"
77-
labels:
78-
- "update"
79-
80-
- package-ecosystem: "docker"
81-
directory: "{{cookiecutter.project_slug}}/compose/production/django/"
82-
schedule:
83-
interval: "daily"
84-
ignore:
85-
- dependency-name: "*"
86-
update-types:
87-
- "version-update:semver-major"
88-
- "version-update:semver-minor"
89-
labels:
90-
- "update"
91-
92-
- package-ecosystem: "docker"
93-
directory: "{{cookiecutter.project_slug}}/compose/production/postgres/"
94-
schedule:
95-
interval: "daily"
96-
labels:
97-
- "update"
98-
99-
- package-ecosystem: "docker"
100-
directory: "{{cookiecutter.project_slug}}/compose/production/nginx/"
101-
schedule:
102-
interval: "daily"
103-
versioning-strategy: increase
104-
labels:
105-
- "update"
106-
107-
- package-ecosystem: "docker"
108-
directory: "{{cookiecutter.project_slug}}/compose/production/traefik/"
55+
directories:
56+
- "{{cookiecutter.project_slug}}/compose/local/node/"
57+
- "{{cookiecutter.project_slug}}/compose/production/aws/"
58+
- "{{cookiecutter.project_slug}}/compose/production/postgres/"
59+
- "{{cookiecutter.project_slug}}/compose/production/nginx/"
60+
- "{{cookiecutter.project_slug}}/compose/production/traefik/"
10961
schedule:
11062
interval: "daily"
11163
labels:

‎CHANGELOG.md

+38
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,44 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
33

44
<!-- GENERATOR_PLACEHOLDER -->
55

6+
## 2025.02.26
7+
8+
9+
### Updated
10+
11+
- Bump traefik from 3.3.3 to 3.3.4 ([#5705](https://github.com/cookiecutter/cookiecutter-django/pull/5705))
12+
13+
## 2025.02.25
14+
15+
16+
### Documentation
17+
18+
- Fix links to FAQ about `contrib.sites` directory ([#5704](https://github.com/cookiecutter/cookiecutter-django/pull/5704))
19+
20+
## 2025.02.23
21+
22+
23+
### Changed
24+
25+
- Group dependabot docker directories ([#5698](https://github.com/cookiecutter/cookiecutter-django/pull/5698))
26+
27+
### Updated
28+
29+
- Update sphinx to 8.2.1 ([#5696](https://github.com/cookiecutter/cookiecutter-django/pull/5696))
30+
31+
- Update psycopg to 3.2.5 ([#5697](https://github.com/cookiecutter/cookiecutter-django/pull/5697))
32+
33+
## 2025.02.21
34+
35+
36+
### Updated
37+
38+
- Update djangorestframework-stubs to 3.15.3 ([#5695](https://github.com/cookiecutter/cookiecutter-django/pull/5695))
39+
40+
- Update sphinx to 8.2.0 ([#5693](https://github.com/cookiecutter/cookiecutter-django/pull/5693))
41+
42+
- Update ruff to 0.9.7 ([#5694](https://github.com/cookiecutter/cookiecutter-django/pull/5694))
43+
644
## 2025.02.17
745

846

‎CONTRIBUTORS.md

+7
Original file line numberDiff line numberDiff line change
@@ -1321,6 +1321,13 @@ Listed in alphabetical order.
13211321
</td>
13221322
<td></td>
13231323
</tr>
1324+
<tr>
1325+
<td>Kawsar Alam Foysal</td>
1326+
<td>
1327+
<a href="https://github.com/iamfoysal">iamfoysal</a>
1328+
</td>
1329+
<td></td>
1330+
</tr>
13241331
<tr>
13251332
<td>Keith Bailey</td>
13261333
<td>

‎pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "cookiecutter-django"
3-
version = "2025.02.17"
3+
version = "2025.02.26"
44
description = "A Cookiecutter template for creating production-ready Django projects quickly."
55
readme = "README.md"
66
keywords = [
@@ -43,7 +43,7 @@ dependencies = [
4343
"pytest-xdist==3.6.1",
4444
"pyyaml==6.0.2",
4545
"requests==2.32.3",
46-
"ruff==0.9.7",
46+
"ruff==0.9.8",
4747
"sh==2.1; sys_platform!='win23'",
4848
"tox==4.23.2",
4949
"tox-uv>=1.17",

‎uv.lock

+23-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎{{cookiecutter.project_slug}}/.github/dependabot.yml

+11-60
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ updates:
1313
{%- if cookiecutter.use_docker == 'y' %}
1414

1515
# Enable version updates for Docker
16-
# We need to specify each Dockerfile in a separate entry because Dependabot doesn't
17-
# support wildcards or recursively checking subdirectories. Check this issue for updates:
18-
# https://github.com/dependabot/dependabot-core/issues/2178
1916
- package-ecosystem: 'docker'
2017
# Look for a `Dockerfile` in the `compose/local/django` directory
21-
directory: 'compose/local/django/'
18+
directories:
19+
- 'compose/local/django/'
20+
- 'compose/local/docs/'
21+
- 'compose/production/django/'
2222
# Every weekday
2323
schedule:
2424
interval: 'daily'
@@ -29,69 +29,20 @@ updates:
2929
- 'version-update:semver-major'
3030
- 'version-update:semver-minor'
3131

32-
- package-ecosystem: 'docker'
33-
# Look for a `Dockerfile` in the `compose/local/docs` directory
34-
directory: 'compose/local/docs/'
35-
# Every weekday
36-
schedule:
37-
interval: 'daily'
38-
# Ignore minor version updates (3.10 -> 3.11) but update patch versions
39-
ignore:
40-
- dependency-name: '*'
41-
update-types:
42-
- 'version-update:semver-major'
43-
- 'version-update:semver-minor'
4432

4533
- package-ecosystem: 'docker'
4634
# Look for a `Dockerfile` in the `compose/local/node` directory
47-
directory: 'compose/local/node/'
48-
# Every weekday
49-
schedule:
50-
interval: 'daily'
51-
52-
- package-ecosystem: 'docker'
53-
# Look for a `Dockerfile` in the `compose/production/aws` directory
54-
directory: 'compose/production/aws/'
55-
# Every weekday
56-
schedule:
57-
interval: 'daily'
58-
59-
- package-ecosystem: 'docker'
60-
# Look for a `Dockerfile` in the `compose/production/django` directory
61-
directory: 'compose/production/django/'
62-
# Every weekday
63-
schedule:
64-
interval: 'daily'
65-
# Ignore minor version updates (3.10 -> 3.11) but update patch versions
66-
ignore:
67-
- dependency-name: '*'
68-
update-types:
69-
- 'version-update:semver-major'
70-
- 'version-update:semver-minor'
71-
72-
- package-ecosystem: 'docker'
73-
# Look for a `Dockerfile` in the `compose/production/postgres` directory
74-
directory: 'compose/production/postgres/'
75-
# Every weekday
76-
schedule:
77-
interval: 'daily'
78-
79-
- package-ecosystem: 'docker'
80-
# Look for a `Dockerfile` in the `compose/production/traefik` directory
81-
directory: 'compose/production/traefik/'
82-
# Every weekday
83-
schedule:
84-
interval: 'daily'
85-
35+
directories:
36+
- 'compose/local/node/'
37+
- 'compose/production/aws/'
38+
- 'compose/production/postgres/'
39+
- 'compose/production/traefik/'
8640
{%- if cookiecutter.cloud_provider == 'None' %}
87-
88-
- package-ecosystem: 'docker'
89-
# Look for a `Dockerfile` in the `compose/production/nginx` directory
90-
directory: 'compose/production/nginx/'
41+
- 'compose/production/nginx/'
42+
{%- endif %}
9143
# Every weekday
9244
schedule:
9345
interval: 'daily'
94-
{%- endif %}
9546

9647
{%- endif %}
9748

‎{{cookiecutter.project_slug}}/.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ repos:
3636

3737
# Run the Ruff linter.
3838
- repo: https://github.com/astral-sh/ruff-pre-commit
39-
rev: v0.9.7
39+
rev: v0.9.8
4040
hooks:
4141
# Linter
4242
- id: ruff

‎{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/traefik:3.3.3
1+
FROM docker.io/traefik:3.3.4
22
RUN mkdir -p /etc/traefik/acme \
33
&& touch /etc/traefik/acme/acme.json \
44
&& chmod 600 /etc/traefik/acme/acme.json

‎{{cookiecutter.project_slug}}/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"@babel/preset-env": "^7.16.5",
77
"@popperjs/core": "^2.10.2",
88
"autoprefixer": "^10.4.0",
9-
"babel-loader": "^9.1.2",
9+
"babel-loader": "^10.0.0",
1010
"bootstrap": "^5.2.3",
1111
"browser-sync": "^3.0.2",
1212
"css-loader": "^7.1.2",

0 commit comments

Comments
 (0)