Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit a2b848a

Browse files
Merge remote-tracking branch 'upstream/master' into vue3-vite
2 parents b5db3e0 + a405d2b commit a2b848a

File tree

15 files changed

+271
-53
lines changed

15 files changed

+271
-53
lines changed

‎.github/contributors.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1473,5 +1473,10 @@
14731473
"name": "Jakub Boukal",
14741474
"github_login": "SukiCZ",
14751475
"twitter_username": ""
1476+
},
1477+
{
1478+
"name": "Christian Jauvin",
1479+
"github_login": "cjauvin",
1480+
"twitter_username": ""
14761481
}
14771482
]

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
{{cookiecutter.project_slug}}/requirements/local.txt
113113
- name: Install dependencies
114114
run: pip install -r requirements.txt
115-
- uses: actions/setup-node@v3
115+
- uses: actions/setup-node@v4
116116
with:
117117
node-version: "18"
118118
- name: Bare Metal ${{ matrix.script.name }}

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repos:
1717
- id: detect-private-key
1818

1919
- repo: https://github.com/pre-commit/mirrors-prettier
20-
rev: "v3.0.3"
20+
rev: "v3.1.0"
2121
hooks:
2222
- id: prettier
2323
args: ["--tab-width", "2"]
@@ -30,7 +30,7 @@ repos:
3030
exclude: hooks/
3131

3232
- repo: https://github.com/psf/black
33-
rev: 23.9.1
33+
rev: 23.11.0
3434
hooks:
3535
- id: black
3636

‎CHANGELOG.md‎

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,167 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
33

44
<!-- GENERATOR_PLACEHOLDER -->
55

6+
## 2023年11月14日
7+
8+
9+
### Updated
10+
11+
- Update sentry-sdk to 1.35.0 ([#4681](https://github.com/cookiecutter/cookiecutter-django/pull/4681))
12+
13+
- Auto-update pre-commit hooks ([#4683](https://github.com/cookiecutter/cookiecutter-django/pull/4683))
14+
15+
## 2023年11月11日
16+
17+
18+
### Updated
19+
20+
- Update celery to 5.3.5 ([#4678](https://github.com/cookiecutter/cookiecutter-django/pull/4678))
21+
22+
## 2023年11月09日
23+
24+
25+
### Updated
26+
27+
- Auto-update pre-commit hooks ([#4673](https://github.com/cookiecutter/cookiecutter-django/pull/4673))
28+
29+
- Update black to 23.11.0 ([#4674](https://github.com/cookiecutter/cookiecutter-django/pull/4674))
30+
31+
## 2023年11月08日
32+
33+
34+
### Updated
35+
36+
- Update pytest-django to 4.7.0 ([#4672](https://github.com/cookiecutter/cookiecutter-django/pull/4672))
37+
38+
## 2023年11月06日
39+
40+
41+
### Changed
42+
43+
- Add `rmbackup` script to remove backups from `postgres/backups`. Fixes: #4663 ([#4664](https://github.com/cookiecutter/cookiecutter-django/pull/4664))
44+
45+
### Updated
46+
47+
- Update django-allauth to 0.58.2 ([#4667](https://github.com/cookiecutter/cookiecutter-django/pull/4667))
48+
49+
- Update uvicorn to 0.24.0.post1 ([#4666](https://github.com/cookiecutter/cookiecutter-django/pull/4666))
50+
51+
## 2023年11月04日
52+
53+
54+
### Updated
55+
56+
- Update uvicorn to 0.24.0 ([#4665](https://github.com/cookiecutter/cookiecutter-django/pull/4665))
57+
58+
## 2023年11月03日
59+
60+
61+
### Updated
62+
63+
- Update flake8-isort to 6.1.1 ([#4662](https://github.com/cookiecutter/cookiecutter-django/pull/4662))
64+
65+
## 2023年11月02日
66+
67+
68+
### Updated
69+
70+
- Update sentry-sdk to 1.34.0 ([#4660](https://github.com/cookiecutter/cookiecutter-django/pull/4660))
71+
72+
## 2023年11月01日
73+
74+
75+
### Updated
76+
77+
- Update django to 4.2.7 ([#4658](https://github.com/cookiecutter/cookiecutter-django/pull/4658))
78+
79+
- Update django-stubs to 4.2.6 ([#4657](https://github.com/cookiecutter/cookiecutter-django/pull/4657))
80+
81+
## 2023年10月31日
82+
83+
84+
### Updated
85+
86+
- Update pytest-django to 4.6.0 ([#4656](https://github.com/cookiecutter/cookiecutter-django/pull/4656))
87+
88+
- Update pytest to 7.4.3 ([#4654](https://github.com/cookiecutter/cookiecutter-django/pull/4654))
89+
90+
- Update werkzeug to 3.0.1 ([#4655](https://github.com/cookiecutter/cookiecutter-django/pull/4655))
91+
92+
- Update sentry-sdk to 1.33.1 ([#4653](https://github.com/cookiecutter/cookiecutter-django/pull/4653))
93+
94+
- Update sentry-sdk to 1.33.0 ([#4652](https://github.com/cookiecutter/cookiecutter-django/pull/4652))
95+
96+
- Update crispy-bootstrap5 to 2023.10 ([#4651](https://github.com/cookiecutter/cookiecutter-django/pull/4651))
97+
98+
## 2023年10月26日
99+
100+
101+
### Updated
102+
103+
- Update django-anymail to 10.2 ([#4645](https://github.com/cookiecutter/cookiecutter-django/pull/4645))
104+
105+
## 2023年10月24日
106+
107+
108+
### Updated
109+
110+
- Update black to 23.10.1 ([#4639](https://github.com/cookiecutter/cookiecutter-django/pull/4639))
111+
112+
- Auto-update pre-commit hooks ([#4641](https://github.com/cookiecutter/cookiecutter-django/pull/4641))
113+
114+
## 2023年10月23日
115+
116+
117+
### Updated
118+
119+
- Update pylint-django to 2.5.5 ([#4638](https://github.com/cookiecutter/cookiecutter-django/pull/4638))
120+
121+
## 2023年10月19日
122+
123+
124+
### Updated
125+
126+
- Update mypy to 1.6.1 ([#4634](https://github.com/cookiecutter/cookiecutter-django/pull/4634))
127+
128+
- Update djangorestframework-stubs to 3.14.4 ([#4637](https://github.com/cookiecutter/cookiecutter-django/pull/4637))
129+
130+
- Update django-stubs to 4.2.5 ([#4636](https://github.com/cookiecutter/cookiecutter-django/pull/4636))
131+
132+
## 2023年10月17日
133+
134+
135+
### Updated
136+
137+
- Auto-update pre-commit hooks ([#4633](https://github.com/cookiecutter/cookiecutter-django/pull/4633))
138+
139+
- Update black to 23.10.0 ([#4632](https://github.com/cookiecutter/cookiecutter-django/pull/4632))
140+
141+
- Update pillow to 10.1.0 ([#4630](https://github.com/cookiecutter/cookiecutter-django/pull/4630))
142+
143+
- Update django-crispy-forms to 2.1 ([#4629](https://github.com/cookiecutter/cookiecutter-django/pull/4629))
144+
145+
## 2023年10月13日
146+
147+
148+
### Updated
149+
150+
- Update pre-commit to 3.5.0 ([#4628](https://github.com/cookiecutter/cookiecutter-django/pull/4628))
151+
152+
- Update watchfiles to 0.21.0 ([#4627](https://github.com/cookiecutter/cookiecutter-django/pull/4627))
153+
154+
## 2023年10月12日
155+
156+
157+
### Updated
158+
159+
- Update django-cors-headers to 4.3.0 ([#4625](https://github.com/cookiecutter/cookiecutter-django/pull/4625))
160+
161+
- Update whitenoise to 6.6.0 ([#4624](https://github.com/cookiecutter/cookiecutter-django/pull/4624))
162+
163+
- Update sentry-sdk to 1.32.0 ([#4623](https://github.com/cookiecutter/cookiecutter-django/pull/4623))
164+
165+
- Bump traefik from 2.10.4 to 2.10.5 ([#4626](https://github.com/cookiecutter/cookiecutter-django/pull/4626))
166+
6167
## 2023年10月09日
7168

8169

‎CONTRIBUTORS.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,13 @@ Listed in alphabetical order.
509509
</td>
510510
<td></td>
511511
</tr>
512+
<tr>
513+
<td>Christian Jauvin</td>
514+
<td>
515+
<a href="https://github.com/cjauvin">cjauvin</a>
516+
</td>
517+
<td></td>
518+
</tr>
512519
<tr>
513520
<td>Christopher Clarke</td>
514521
<td>

‎docs/docker-postgres-backups.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,15 @@ You will see something like ::
9292

9393
Backup to Amazon S3
9494
----------------------------------
95+
9596
For uploading your backups to Amazon S3 you can use the aws cli container. There is an upload command for uploading the postgres /backups directory recursively and there is a download command for downloading a specific backup. The default S3 environment variables are used. ::
9697

9798
$ docker compose -f production.yml run --rm awscli upload
9899
$ docker compose -f production.yml run --rm awscli download backup_2018_03_13T09_05_07.sql.gz
100+
101+
Remove Backup
102+
----------------------------------
103+
104+
To remove backup you can use the ``rmbackup`` command. This will remove the backup from the ``/backups`` directory. ::
105+
106+
$ docker compose -f local.yml exec postgres rmbackup backup_2018_03_13T09_05_07.sql.gz

‎requirements.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ binaryornot==0.4.4
44

55
# Code quality
66
# ------------------------------------------------------------------------------
7-
black==23.9.1
7+
black==23.11.0
88
isort==5.12.0
99
flake8==6.1.0
1010
django-upgrade==1.15.0
1111
djlint==1.34.0
12-
pre-commit==3.4.0
12+
pre-commit==3.5.0
1313

1414
# Testing
1515
# ------------------------------------------------------------------------------
1616
tox==4.11.3
17-
pytest==7.4.2
18-
pytest-xdist==3.3.1
17+
pytest==7.4.3
18+
pytest-xdist==3.4.0
1919
pytest-cookies==0.7.0
2020
pytest-instafail==0.5.0
2121
pyyaml==6.0.1
2222

2323
# Scripting
2424
# ------------------------------------------------------------------------------
2525
PyGithub==2.1.1
26-
gitpython==3.1.37
26+
gitpython==3.1.40
2727
jinja2==3.1.2
2828
requests==2.31.0

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from distutils.core import setup
66

77
# We use calendar versioning
8-
version = "2023.10.09"
8+
version = "2023.11.14"
99

1010
with open("README.md") as readme_file:
1111
long_description = readme_file.read()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ repos:
1818
- id: detect-private-key
1919

2020
- repo: https://github.com/pre-commit/mirrors-prettier
21-
rev: v3.0.3
21+
rev: v3.1.0
2222
hooks:
2323
- id: prettier
2424
args: ['--tab-width', '2', '--single-quote']
@@ -37,7 +37,7 @@ repos:
3737
args: [--py311-plus]
3838

3939
- repo: https://github.com/psf/black
40-
rev: 23.9.1
40+
rev: 23.11.0
4141
hooks:
4242
- id: black
4343

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/usr/bin/env bash
2+
3+
### Remove a database backup.
4+
###
5+
### Parameters:
6+
### <1> filename of a backup to remove.
7+
###
8+
### Usage:
9+
### $ docker-compose -f <environment>.yml (exec |run --rm) postgres rmbackup <1>
10+
11+
12+
set -o errexit
13+
set -o pipefail
14+
set -o nounset
15+
16+
17+
working_dir="$(dirname ${0})"
18+
source "${working_dir}/_sourced/constants.sh"
19+
source "${working_dir}/_sourced/messages.sh"
20+
21+
22+
if [[ -z ${1+x} ]]; then
23+
message_error "Backup filename is not specified yet it is a required parameter. Make sure you provide one and try again."
24+
exit 1
25+
fi
26+
backup_filename="${BACKUP_DIR_PATH}/${1}"
27+
if [[ ! -f "${backup_filename}" ]]; then
28+
message_error "No backup with the specified filename found. Check out the 'backups' maintenance script output to see if there is one and try again."
29+
exit 1
30+
fi
31+
32+
message_welcome "Removing the '${backup_filename}' backup file..."
33+
34+
rm -r "${backup_filename}"
35+
36+
message_success "The '${backup_filename}' database backup has been removed."

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /