Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uv #5

Closed
wants to merge 94 commits into from
Closed

Uv #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
6f3b72d
Use wait-for-it in favor of the custom python script when waiting for…
foarsitter Aug 27, 2024
c44f6f6
Fix Makefile and make.bat files for doc generation using sphinx-build…
ljfp Sep 5, 2024
d6f18f0
Remove empty setup.py and references to it (#5355)
foarsitter Sep 6, 2024
1a2bcc5
Release 2024.09.06
actions-user Sep 7, 2024
ab84c21
Fix Requires Python to allow minor versions (#5360)
rxm7706 Sep 7, 2024
e956b83
Update Contributors
foarsitter Sep 7, 2024
a437e49
Release 2024.09.07
actions-user Sep 8, 2024
66ebc4e
Remove storages from `INSTALLED_APPS` (#5361)
mcastle Sep 8, 2024
ef53145
Update Contributors
browniebroke Sep 8, 2024
1f7fa64
Update tox from 4.18.0 to 4.18.1 (#5358)
pyup-bot Sep 8, 2024
8559078
Auto-update pre-commit hooks (#5357)
github-actions[bot] Sep 8, 2024
2c90ff5
Release 2024.09.08
actions-user Sep 9, 2024
3e253cc
Auto-update pre-commit hooks (#5362)
github-actions[bot] Sep 9, 2024
ab36a61
Bump tiangolo/issue-manager from 0.5.0 to 0.5.1 (#5364)
dependabot[bot] Sep 9, 2024
8f8f87d
Update sentry-sdk to 2.14.0 (#5365)
pyup-bot Sep 9, 2024
50a8c2b
Release 2024.09.09
actions-user Sep 10, 2024
9f1037a
Bump python to 3.12.6 in docs Docker image (#5369)
dependabot[bot] Sep 10, 2024
40de2de
Bump python to 3.12.6 in production Docker (#5367)
dependabot[bot] Sep 10, 2024
4865e05
Bump python to 3.12.6 in local Docker (#5370)
dependabot[bot] Sep 10, 2024
d841c79
Bump concurrently from 8.2.2 to 9.0.0 (#5363)
dependabot[bot] Sep 10, 2024
e567d05
Bump postcss-preset-env from 9.6.0 to 10.0.3 (#5368)
dependabot[bot] Sep 10, 2024
69be07f
Add nginx container to dependabot
luzfcb Sep 4, 2024
a882f40
Update pytest to 8.3.3 (#5371)
pyup-bot Sep 10, 2024
0c11f9c
Release 2024.09.10
actions-user Sep 11, 2024
043ecd7
Update django-anymail to 12.0 (#5366)
pyup-bot Sep 11, 2024
f313362
Update djangorestframework-stubs from 3.15.0 to 3.15.1 (#5372)
pyup-bot Sep 11, 2024
1f6b8b4
Release 2024.09.11
actions-user Sep 12, 2024
0b43f14
Update ruff to 0.6.5 (#5373)
pyup-bot Sep 15, 2024
0931402
Release 2024.09.15
actions-user Sep 16, 2024
c82e825
Update psycopg to 3.2.2 (#5378)
pyup-bot Sep 16, 2024
f3b3d14
Release 2024.09.16
actions-user Sep 17, 2024
ac990f6
Bump traefik from 3.1.2 to 3.1.3 (#5380)
dependabot[bot] Sep 17, 2024
8431c36
Set allauth email subject prefix (#5278)
alexkanavos Sep 17, 2024
6471d60
Update Contributors
browniebroke Sep 17, 2024
6f15595
Update heroku runtime to latest version
browniebroke Sep 17, 2024
caae3ce
Update deployment-on-heroku.rst (#5383)
theptrk Sep 17, 2024
c0b9054
Update tox from 4.18.1 to 4.19.0 (#5381)
pyup-bot Sep 17, 2024
a5ca04c
Update sphinx-autobuild from 2024.9.3 to 2024.9.17 (#5382)
pyup-bot Sep 17, 2024
1dc0244
Release 2024.09.17
actions-user Sep 18, 2024
aab05d3
Auto-update pre-commit hooks (#5384)
github-actions[bot] Sep 18, 2024
63abaaa
Update tox from 4.19.0 to 4.20.0
pyup-bot Sep 19, 2024
f1b5b66
Update ruff from 0.6.5 to 0.6.6
pyup-bot Sep 20, 2024
d1e3391
Update ruff from 0.6.5 to 0.6.6
pyup-bot Sep 20, 2024
7f07b02
Bump traefik
dependabot[bot] Sep 20, 2024
2396bfb
Update sphinx-autobuild from 2024.9.17 to 2024.9.19
pyup-bot Sep 18, 2024
c3345e1
Release 2024.09.20
actions-user Sep 21, 2024
d0ddb00
Auto-update pre-commit hooks (#5391)
github-actions[bot] Sep 21, 2024
37a2086
Release 2024.09.21
actions-user Sep 22, 2024
ec4438a
Auto-update pre-commit hooks
browniebroke Sep 22, 2024
af9b0bc
Update django-allauth from 64.2.1 to 65.0.0
pyup-bot Sep 22, 2024
a0d6949
Update ruff to 0.6.7 (#5394)
pyup-bot Sep 23, 2024
d5ab2a1
Merge pull request #5393 from cookiecutter/pyup-update-django-allauth…
foarsitter Sep 23, 2024
eb67667
Merge pull request #5392 from cookiecutter/update/pre-commit-autoupdate
foarsitter Sep 23, 2024
2b37524
Merge pull request #5347 from ljfp/sphinx-makefile-fix
foarsitter Sep 23, 2024
77813a9
Update Contributors
foarsitter Sep 23, 2024
fc6a38e
Update django-allauth from 65.0.0 to 65.0.1
pyup-bot Sep 23, 2024
4fc2dec
Merge pull request #5399 from cookiecutter/pyup-update-django-allauth…
foarsitter Sep 23, 2024
f339753
Update django-stubs from 5.0.4 to 5.1.0
pyup-bot Sep 23, 2024
bf67fe4
Release 2024.09.23
actions-user Sep 24, 2024
5e9d606
Merge pull request #5400 from cookiecutter/pyup-update-django-stubs-5…
foarsitter Sep 24, 2024
8329947
Release 2024.09.24
actions-user Sep 25, 2024
4e7a412
Update ruff to 0.6.8 (#5402)
pyup-bot Sep 26, 2024
9de28fc
Release 2024.09.26
actions-user Sep 27, 2024
811b301
Update django-allauth to 65.0.2 (#5405)
pyup-bot Sep 27, 2024
5023e54
Update redis from 5.0.8 to 5.1.0
pyup-bot Sep 27, 2024
80680fe
Release 2024.09.27
actions-user Sep 28, 2024
748382c
Update uvicorn to 0.31.0 (#5408)
pyup-bot Sep 28, 2024
866e629
Release 2024.09.28
actions-user Sep 29, 2024
053543d
Update psycopg to 3.2.3 (#5411)
pyup-bot Sep 29, 2024
60adaa7
Release 2024.09.29
actions-user Sep 30, 2024
faba566
Update sentry-sdk to 2.15.0 (#5413)
pyup-bot Oct 1, 2024
f8ef6c6
Release 2024.10.01
actions-user Oct 2, 2024
9379027
Bump python from 3.12.6 to 3.12.7 production Docker (#5414)
dependabot[bot] Oct 2, 2024
ec499fa
Bump python from 3.12.6 to 3.12.7 in local Docker image (#5415)
dependabot[bot] Oct 2, 2024
e081993
Bump python from 3.12.6 to 3.12.7 in docs Docker image (#5416)
dependabot[bot] Oct 2, 2024
12380e1
Update Heroku runtime version to 3.12.7
browniebroke Oct 2, 2024
9bbee5f
Release 2024.10.02
actions-user Oct 3, 2024
6f858e9
Bump traefik from 3.1.4 to 3.1.5 (#5423)
dependabot[bot] Oct 3, 2024
33c75ad
Update sphinx-autobuild to 2024.10.3 (#5420)
pyup-bot Oct 3, 2024
463d671
Add sphinx-autobuild to the template project and tidy up make files
browniebroke Oct 3, 2024
5e582d0
Update tox from 4.20.0 to 4.21.2
pyup-bot Oct 3, 2024
168aae1
Update source_suffix mapping
browniebroke Oct 3, 2024
d703580
Release 2024.10.03
actions-user Oct 4, 2024
2cbb3bd
Update redis to 5.1.1 (#5427)
pyup-bot Oct 4, 2024
732c878
Update ruff to 0.6.9 (#5428)
pyup-bot Oct 4, 2024
120ba0d
Release 2024.10.04
actions-user Oct 5, 2024
37aa462
Merge pull request #5424 from browniebroke/sphinx-auto-build-template
foarsitter Oct 5, 2024
56fce2b
Merge pull request #5425 from cookiecutter/pyup-update-tox-4.20.0-to-…
foarsitter Oct 5, 2024
6c64a81
Merge pull request #5327 from foarsitter/wait_for_it
foarsitter Oct 5, 2024
b0c4522
Group docs into sections (#5426)
browniebroke Oct 5, 2024
a0af461
Update crispy-bootstrap5 from 2024.2 to 2024.10 (#5430)
pyup-bot Oct 5, 2024
0a291c1
Replace pip with uv for the project files
foarsitter Sep 5, 2024
5c4abe5
Remove actions/setup-python steps because uv run and uv sync take car…
foarsitter Sep 16, 2024
9a3e7eb
Use --frozen for running scripts to avoid updating the environment
foarsitter Sep 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/contributors.json
Original file line number Diff line number Diff line change
Expand Up @@ -1628,5 +1628,25 @@
"name": "Will",
"github_login": "novucs",
"twitter_username": ""
},
{
"name": "rxm7706",
"github_login": "rxm7706",
"twitter_username": ""
},
{
"name": "Marlon Castillo",
"github_login": "mcastle",
"twitter_username": ""
},
{
"name": "Alex Kanavos",
"github_login": "alexkanavos",
"twitter_username": ""
},
{
"name": "LJFP",
"github_login": "ljfp",
"twitter_username": ""
}
]
9 changes: 8 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Config for Dependabot updates. See Documentation here:
# https://docs.github.com/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
Expand Down Expand Up @@ -96,6 +96,13 @@ updates:
labels:
- "update"

- package-ecosystem: "docker"
directory: "{{cookiecutter.project_slug}}/compose/production/nginx/"
schedule:
interval: "daily"
labels:
- "update"

- package-ecosystem: "docker"
directory: "{{cookiecutter.project_slug}}/compose/production/traefik/"
schedule:
Expand Down
30 changes: 13 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- name: Install uv
uses: astral-sh/setup-uv@v2
with:
python-version: "3.12"
cache: pip
enable-cache: "true"
- name: Install dependencies
run: pip install -r requirements.txt
run: uv sync
- name: Run tests
run: pytest -n auto tests
run: uv run pytest -n auto tests

docker:
strategy:
Expand All @@ -54,12 +54,12 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- name: Install uv
uses: astral-sh/setup-uv@v2
with:
python-version: "3.12"
cache: pip
enable-cache: "true"
- name: Install dependencies
run: pip install -r requirements.txt
run: uv sync
- name: Docker ${{ matrix.script.name }}
run: sh tests/test_docker.sh ${{ matrix.script.args }}

Expand Down Expand Up @@ -98,16 +98,12 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- name: Install uv
uses: astral-sh/setup-uv@v2
with:
python-version: "3.12"
cache: pip
cache-dependency-path: |
requirements.txt
{{cookiecutter.project_slug}}/requirements/base.txt
{{cookiecutter.project_slug}}/requirements/local.txt
enable-cache: "true"
- name: Install dependencies
run: pip install -r requirements.txt
run: uv sync
- uses: actions/setup-node@v4
with:
node-version: "22"
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/django-issue-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- name: Install uv
uses: astral-sh/setup-uv@v2
with:
python-version: "3.12"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
enable-cache: "true"
- name: Create Django Major Issue
run: python scripts/create_django_issue.py
run: uv run --frozen scripts/create_django_issue.py
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/issue-manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

runs-on: ubuntu-latest
steps:
- uses: tiangolo/[email protected].0
- uses: tiangolo/[email protected].1
with:
token: ${{ secrets.GITHUB_TOKEN }}
config: >
Expand Down
13 changes: 4 additions & 9 deletions .github/workflows/update-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
- name: Install uv
uses: astral-sh/setup-uv@v2
with:
python-version: "3.12"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
enable-cache: "true"
- name: Set git details
run: |
git config --global user.name "github-actions"
git config --global user.email "[email protected]"
- name: Update list
run: python scripts/update_changelog.py
run: uv run --frozen scripts/update_changelog.py
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
13 changes: 4 additions & 9 deletions .github/workflows/update-contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
- name: Install uv
uses: astral-sh/setup-uv@v2
with:
python-version: "3.12"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
enable-cache: "true"
- name: Update list
run: python scripts/update_contributors.py
run: uv run --frozen scripts/update_contributors.py
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ repos:
- id: flake8

- repo: https://github.com/tox-dev/pyproject-fmt
rev: "2.0.4"
rev: "2.2.4"
hooks:
- id: pyproject-fmt

Expand Down
203 changes: 203 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,209 @@ All enhancements and patches to Cookiecutter Django will be documented in this f

<!-- GENERATOR_PLACEHOLDER -->

## 2024.10.04


### Updated

- Update ruff to 0.6.9 ([#5428](https://github.com/cookiecutter/cookiecutter-django/pull/5428))

- Update redis to 5.1.1 ([#5427](https://github.com/cookiecutter/cookiecutter-django/pull/5427))

## 2024.10.03


### Updated

- Update sphinx-autobuild to 2024.10.3 ([#5420](https://github.com/cookiecutter/cookiecutter-django/pull/5420))

- Bump traefik from 3.1.4 to 3.1.5 ([#5423](https://github.com/cookiecutter/cookiecutter-django/pull/5423))

## 2024.10.02


### Updated

- Bump python from 3.12.6 to 3.12.7 in docs Docker image ([#5416](https://github.com/cookiecutter/cookiecutter-django/pull/5416))

- Bump python from 3.12.6 to 3.12.7 in local Docker image ([#5415](https://github.com/cookiecutter/cookiecutter-django/pull/5415))

- Bump python from 3.12.6 to 3.12.7 production Docker ([#5414](https://github.com/cookiecutter/cookiecutter-django/pull/5414))

## 2024.10.01


### Updated

- Update sentry-sdk to 2.15.0 ([#5413](https://github.com/cookiecutter/cookiecutter-django/pull/5413))

## 2024.09.29


### Updated

- Update psycopg to 3.2.3 ([#5411](https://github.com/cookiecutter/cookiecutter-django/pull/5411))

## 2024.09.28


### Updated

- Update uvicorn to 0.31.0 ([#5408](https://github.com/cookiecutter/cookiecutter-django/pull/5408))

## 2024.09.27


### Updated

- Update redis to 5.1.0 ([#5406](https://github.com/cookiecutter/cookiecutter-django/pull/5406))

- Update django-allauth to 65.0.2 ([#5405](https://github.com/cookiecutter/cookiecutter-django/pull/5405))

## 2024.09.26


### Updated

- Update ruff to 0.6.8 ([#5402](https://github.com/cookiecutter/cookiecutter-django/pull/5402))

## 2024.09.24


### Updated

- Update django-stubs to 5.1.0 ([#5400](https://github.com/cookiecutter/cookiecutter-django/pull/5400))

## 2024.09.23


### Changed

- Fix Makefile and make.bat files used for automatic generation of documentation. ([#5347](https://github.com/cookiecutter/cookiecutter-django/pull/5347))

### Updated

- Update django-allauth to 65.0.1 ([#5399](https://github.com/cookiecutter/cookiecutter-django/pull/5399))

- Auto-update pre-commit hooks ([#5392](https://github.com/cookiecutter/cookiecutter-django/pull/5392))

- Update django-allauth to 65.0.0 ([#5393](https://github.com/cookiecutter/cookiecutter-django/pull/5393))

- Update ruff to 0.6.7 ([#5394](https://github.com/cookiecutter/cookiecutter-django/pull/5394))

## 2024.09.21


### Updated

- Auto-update pre-commit hooks ([#5391](https://github.com/cookiecutter/cookiecutter-django/pull/5391))

## 2024.09.20


### Updated

- Update sphinx-autobuild to 2024.9.19 ([#5386](https://github.com/cookiecutter/cookiecutter-django/pull/5386))

- Bump traefik from 3.1.3 to 3.1.4 in /{{cookiecutter.project_slug}}/compose/production/traefik ([#5389](https://github.com/cookiecutter/cookiecutter-django/pull/5389))

- Update ruff to 0.6.6 ([#5388](https://github.com/cookiecutter/cookiecutter-django/pull/5388))

- Update tox to 4.20.0 ([#5387](https://github.com/cookiecutter/cookiecutter-django/pull/5387))

## 2024.09.17


### Fixed

- Set allauth email subject prefix ([#5278](https://github.com/cookiecutter/cookiecutter-django/pull/5278))

### Documentation

- Update postgres plan in Heroku deployment docs ([#5383](https://github.com/cookiecutter/cookiecutter-django/pull/5383))

### Updated

- Update sphinx-autobuild to 2024.9.17 ([#5382](https://github.com/cookiecutter/cookiecutter-django/pull/5382))

- Bump traefik from 3.1.2 to 3.1.3 ([#5380](https://github.com/cookiecutter/cookiecutter-django/pull/5380))

## 2024.09.16


### Updated

- Update psycopg to 3.2.2 ([#5378](https://github.com/cookiecutter/cookiecutter-django/pull/5378))

## 2024.09.15


### Updated

- Update ruff to 0.6.5 ([#5373](https://github.com/cookiecutter/cookiecutter-django/pull/5373))

## 2024.09.11


### Updated

- Update djangorestframework-stubs to 3.15.1 ([#5372](https://github.com/cookiecutter/cookiecutter-django/pull/5372))

- Update django-anymail to 12.0 ([#5366](https://github.com/cookiecutter/cookiecutter-django/pull/5366))

## 2024.09.10


### Changed

- Add nginx container to dependabot automation ([#5345](https://github.com/cookiecutter/cookiecutter-django/pull/5345))

### Updated

- Update pytest to 8.3.3 ([#5371](https://github.com/cookiecutter/cookiecutter-django/pull/5371))

- Bump postcss-preset-env from 9.6.0 to 10.0.3 ([#5368](https://github.com/cookiecutter/cookiecutter-django/pull/5368))

- Bump concurrently from 8.2.2 to 9.0.0 ([#5363](https://github.com/cookiecutter/cookiecutter-django/pull/5363))

- Bump python to 3.12.6 in local Docker ([#5370](https://github.com/cookiecutter/cookiecutter-django/pull/5370))

- Bump python to 3.12.6 in production Docker ([#5367](https://github.com/cookiecutter/cookiecutter-django/pull/5367))

- Bump python to 3.12.6 in docs Docker image ([#5369](https://github.com/cookiecutter/cookiecutter-django/pull/5369))

## 2024.09.09


### Updated

- Update sentry-sdk to 2.14.0 ([#5365](https://github.com/cookiecutter/cookiecutter-django/pull/5365))

## 2024.09.08


### Changed

- Remove &#34;storages&#34; from `INSTALLED_APPS` ([#5361](https://github.com/cookiecutter/cookiecutter-django/pull/5361))

## 2024.09.07


### Changed

- Fix Requires Python to allow minor versions ([#5360](https://github.com/cookiecutter/cookiecutter-django/pull/5360))

## 2024.09.06


### Updated

- Update ruff to 0.6.4 ([#5354](https://github.com/cookiecutter/cookiecutter-django/pull/5354))

- Update django-allauth to 64.2.1 ([#5352](https://github.com/cookiecutter/cookiecutter-django/pull/5352))

- Auto-update pre-commit hooks ([#5353](https://github.com/cookiecutter/cookiecutter-django/pull/5353))

## 2024.09.05


Expand Down
Loading