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 generated project #7

Closed
wants to merge 103 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
ba3b48d
Update pre-commit from 3.8.0 to 4.0.0
pyup-bot Oct 5, 2024
52ce09e
Release 2024.10.05
actions-user Oct 6, 2024
29bd84b
Auto-update pre-commit hooks
browniebroke Oct 6, 2024
1bbd6d5
Bump astral-sh/setup-uv from 2 to 3
dependabot[bot] Oct 7, 2024
7114a1e
Bump amazon/aws-cli
dependabot[bot] Oct 7, 2024
d826d2e
Merge pull request #5435 from cookiecutter/dependabot/github_actions/…
foarsitter Oct 7, 2024
1a89345
Update sphinx-rtd-theme from 2.0.0 to 3.0.0
pyup-bot Oct 7, 2024
7d9f58b
Merge pull request #5436 from cookiecutter/dependabot/docker/{{cookie…
foarsitter Oct 7, 2024
877d81d
Merge pull request #5437 from cookiecutter/pyup-update-sphinx-rtd-the…
foarsitter Oct 7, 2024
907bfa5
Bump sphinx from 7.4.7 to 8.0.2 in /docs
dependabot[bot] Aug 5, 2024
f86ebbb
Merge pull request #5433 from cookiecutter/update/pre-commit-autoupdate
foarsitter Oct 7, 2024
0d9fbfd
Merge pull request #5432 from cookiecutter/pyup-update-pre-commit-3.8…
foarsitter Oct 7, 2024
d879c0b
Merge pull request #5264 from cookiecutter/dependabot/pip/docs/sphinx…
foarsitter Oct 7, 2024
f590d14
Update sphinx to 8.0.2 (#5263)
pyup-bot Oct 7, 2024
3252aa7
Add workflow to run uv lock (#5422)
browniebroke Oct 7, 2024
2d06ddd
Migrate docs build to use uv (#5438)
browniebroke Oct 7, 2024
c115b2e
Docs: fix Mailgun include in troubleshooting sections (#5439)
browniebroke Oct 7, 2024
49ed4a0
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Oct 8, 2024
d95f881
Release 2024.10.07
actions-user Oct 8, 2024
c2caf52
Auto-update pre-commit hooks
browniebroke Oct 8, 2024
30295fe
Bump amazon/aws-cli
dependabot[bot] Oct 8, 2024
214e5f5
Use uv sync & uv run in docs build (#5440)
browniebroke Oct 8, 2024
6a2effb
Merge pull request #5442 from cookiecutter/update/pre-commit-autoupdate
foarsitter Oct 8, 2024
c3ec0b0
Merge pull request #5441 from cookiecutter/pre-commit-ci-update-config
foarsitter Oct 8, 2024
9ada7ab
Merge pull request #5443 from cookiecutter/dependabot/docker/{{cookie…
foarsitter Oct 8, 2024
b66960e
Update pre-commit to 4.0.1 (#5445)
pyup-bot Oct 8, 2024
8fb90ab
Release 2024.10.08
actions-user Oct 9, 2024
0bd6069
Update coverage to 7.6.2 (#5448)
pyup-bot Oct 9, 2024
a0c599d
Release 2024.10.09
actions-user Oct 10, 2024
44dc469
Bump traefik from 3.1.5 to 3.1.6 (#5449)
dependabot[bot] Oct 10, 2024
f3d4a9f
Update sentry-sdk from 2.15.0 to 2.16.0
pyup-bot Oct 8, 2024
1ebaddc
Release 2024.10.10
actions-user Oct 11, 2024
ed184d4
Auto-update pre-commit hooks
browniebroke Oct 11, 2024
4696302
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 11, 2024
bee4124
Regenerate uv.lock
pre-commit-ci[bot] Oct 11, 2024
dcde07d
wait-for-it as dependency in the run stage
foarsitter Oct 11, 2024
2eb0b22
Merge pull request #5452 from foarsitter/wait-for-it
foarsitter Oct 11, 2024
5fead04
Merge pull request #5450 from cookiecutter/update/pre-commit-autoupdate
foarsitter Oct 11, 2024
b96e118
Update README.md broken links
spothound Oct 11, 2024
6994914
Update Contributors
luzfcb Oct 11, 2024
54247e7
Update Nginx dependabot versioning-strategy
luzfcb Oct 11, 2024
209b54a
Update sphinx from 8.0.2 to 8.1.1
pyup-bot Oct 12, 2024
92cf1da
Release 2024.10.11
actions-user Oct 12, 2024
3f2155a
Auto-update pre-commit hooks
browniebroke Oct 12, 2024
abfc6b0
Update django-cors-headers from 4.4.0 to 4.5.0
pyup-bot Oct 12, 2024
c1092f5
Merge pull request #5459 from cookiecutter/pyup-update-django-cors-he…
foarsitter Oct 12, 2024
98f4863
Merge pull request #5458 from cookiecutter/update/pre-commit-autoupdate
foarsitter Oct 12, 2024
822c1c0
Merge pull request #5457 from cookiecutter/pyup-update-sphinx-8.0.2-t…
foarsitter Oct 12, 2024
931e300
Pin Python version to 3.12 (#5456)
browniebroke Oct 12, 2024
a0c8863
Release 2024.10.12
actions-user Oct 13, 2024
b042b21
Add requirements for ubuntu 24.04
foarsitter Oct 14, 2024
ccb0d97
Merge pull request #5467 from cookiecutter/5465-missing-os-requiremen…
foarsitter Oct 14, 2024
04d6620
Update coverage from 7.6.2 to 7.6.3
pyup-bot Oct 14, 2024
057562b
Update sphinx from 8.1.1 to 8.1.3
pyup-bot Oct 14, 2024
8831a8b
Merge pull request #5464 from cookiecutter/pyup-update-coverage-7.6.2…
foarsitter Oct 14, 2024
62f39cd
Merge pull request #5463 from cookiecutter/pyup-update-sphinx-8.1.1-t…
foarsitter Oct 14, 2024
4709a30
Remove CELERY_BROKER_URL in favor of REDIS_URL
foarsitter Feb 15, 2024
deb813c
Release 2024.10.14
actions-user Oct 15, 2024
16b2c16
Auto-update pre-commit hooks (#5469)
github-actions[bot] Oct 15, 2024
67af42b
Release 2024.10.15
actions-user Oct 16, 2024
ff7874b
Update sentry-sdk to 2.17.0 (#5473)
pyup-bot Oct 17, 2024
dc4d102
Update pillow to 11.0.0 (#5470)
pyup-bot Oct 17, 2024
ae86e01
Update uvicorn to 0.32.0 (#5471)
pyup-bot Oct 17, 2024
ca40504
Auto-update pre-commit hooks (#5475)
github-actions[bot] Oct 17, 2024
abc199d
Update ruff to 0.7.0 (#5474)
pyup-bot Oct 17, 2024
8c1fac1
Run uv lock when updating template version (#5478)
browniebroke Oct 17, 2024
1b83a47
Release 2024.10.17
actions-user Oct 18, 2024
6f5f1b8
Fix a number of issues with Azure storage (#5476)
browniebroke Oct 21, 2024
02f6336
Update coverage to 7.6.4 (#5480)
pyup-bot Oct 21, 2024
8bf9a8c
Add a default for REDIS_URL and add it as a variable to the settings
foarsitter Oct 21, 2024
9806ba7
Merge pull request #4861 from foarsitter/remove_celery_broker_url
foarsitter Oct 21, 2024
a829571
Release 2024.10.21
actions-user Oct 22, 2024
020639f
Fix broken links in generated README.md (#5482)
mariot Oct 22, 2024
2533f72
Update Contributors
browniebroke Oct 22, 2024
edd8a8b
Auto-update pre-commit hooks (#5483)
github-actions[bot] Oct 22, 2024
b4737ac
Release 2024.10.22
actions-user Oct 23, 2024
ceafff0
Update django-allauth from 65.0.2 to 65.1.0 (#5485)
pyup-bot Oct 24, 2024
244d7ac
Update redis to 5.2.0 (#5486)
pyup-bot Oct 24, 2024
109238f
Update ruff to 0.7.1 (#5487)
pyup-bot Oct 24, 2024
fb6549d
Update werkzeug from 3.0.4 to 3.0.5
pyup-bot Oct 25, 2024
33a707d
Release 2024.10.24
actions-user Oct 25, 2024
0384b8f
Auto-update pre-commit hooks (#5490)
github-actions[bot] Oct 25, 2024
428fac8
Remove watchdog pin <4
browniebroke Oct 25, 2024
17a1bf7
Merge pull request #5489 from cookiecutter/pyup-update-werkzeug-3.0.4…
foarsitter Oct 25, 2024
60cc312
Release 2024.10.25
actions-user Oct 26, 2024
59557b2
WIP
foarsitter Oct 5, 2024
fa07d79
Using the docker compose watch so .venv can be ignored
foarsitter Oct 6, 2024
c447cc0
Fix missing uv.lock
foarsitter Oct 6, 2024
089b632
Fix travis tests
foarsitter Oct 6, 2024
bbded7e
Use uv run for sphinx-build
foarsitter Oct 6, 2024
81af56f
Activate virtualenv for making docs
foarsitter Oct 6, 2024
b55e2cf
Add uv.lock
foarsitter Oct 22, 2024
0a9f9e4
Add a finish trap on exit for testing
foarsitter Oct 22, 2024
31a328b
Add uv.lock & fix user
foarsitter Oct 22, 2024
66e2548
Allow to write to uv.lock
foarsitter Oct 22, 2024
af5701f
Use uv to run make docs
foarsitter Oct 6, 2024
ad24101
Lockfile & single stage docker image
foarsitter Oct 26, 2024
353b279
Add minimal lockfile to satisfy bind
foarsitter Oct 26, 2024
6bae8e7
Remove empty requirement files
foarsitter Oct 26, 2024
4274147
Remove watch directive
foarsitter Oct 26, 2024
f57c2f9
Update local development docs
foarsitter Oct 26, 2024
46cd561
Cleanup
foarsitter Oct 26, 2024
8f3ca43
Fix closing tag
foarsitter Oct 26, 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
10 changes: 10 additions & 0 deletions .github/contributors.json
Original file line number Diff line number Diff line change
Expand Up @@ -1648,5 +1648,15 @@
"name": "LJFP",
"github_login": "ljfp",
"twitter_username": ""
},
{
"name": "Francisco Navarro Morales ",
"github_login": "spothound",
"twitter_username": ""
},
{
"name": "Mariot Tsitoara",
"github_login": "mariot",
"twitter_username": ""
}
]
1 change: 1 addition & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ updates:
directory: "{{cookiecutter.project_slug}}/compose/production/nginx/"
schedule:
interval: "daily"
versioning-strategy: increase
labels:
- "update"

Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Install uv
uses: astral-sh/setup-uv@v2
uses: astral-sh/setup-uv@v3
with:
enable-cache: "true"
- name: Install dependencies
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Install uv
uses: astral-sh/setup-uv@v2
uses: astral-sh/setup-uv@v3
with:
enable-cache: "true"
- name: Install dependencies
Expand Down Expand Up @@ -92,14 +92,17 @@ jobs:
POSTGRES_PASSWORD: postgres

env:
CELERY_BROKER_URL: "redis://localhost:6379/0"
REDIS_URL: "redis://localhost:6379/0"
# postgres://user:password@host:port/database
DATABASE_URL: "postgres://postgres:postgres@localhost:5432/postgres"

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.12"
- name: Install uv
uses: astral-sh/setup-uv@v2
uses: astral-sh/setup-uv@v3
with:
enable-cache: "true"
- name: Install dependencies
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/dependabot-uv-lock.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: uv

on:
pull_request:
paths:
- "pyproject.toml"

permissions:
contents: write
pull-requests: write

jobs:
lock:
if: ${{ github.actor == 'dependabot[bot]' }}
runs-on: ubuntu-latest
env:
GH_PAT: ${{ secrets.GH_PAT }}
steps:
- name: Checkout with token
uses: actions/checkout@v4
if: ${{ env.GH_PAT != '' }}
with:
token: ${{ env.GH_PAT }}

- name: Checkout without token
uses: actions/checkout@v4
if: ${{ env.GH_PAT == '' }}

- uses: astral-sh/setup-uv@v3
with:
enable-cache: true
- run: uv lock
- uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Regenerate uv.lock
2 changes: 1 addition & 1 deletion .github/workflows/django-issue-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Install uv
uses: astral-sh/setup-uv@v2
uses: astral-sh/setup-uv@v3
with:
enable-cache: "true"
- name: Create Django Major Issue
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Install uv
uses: astral-sh/setup-uv@v2
uses: astral-sh/setup-uv@v3
with:
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
- name: Update changelog
run: uv run --frozen scripts/update_changelog.py
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/update-contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Install uv
uses: astral-sh/setup-uv@v2
uses: astral-sh/setup-uv@v3
with:
enable-cache: "true"
- name: Update list
Expand Down
10 changes: 5 additions & 5 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
exclude: "{{cookiecutter.project_slug}}|.github/contributors.json|CHANGELOG.md|CONTRIBUTORS.md"
default_stages: [commit]
default_stages: [pre-commit]

default_language_version:
python: python3.12

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -26,14 +26,14 @@ repos:
args: ["--tab-width", "2"]

- repo: https://github.com/asottile/pyupgrade
rev: v3.17.0
rev: v3.19.0
hooks:
- id: pyupgrade
args: [--py312-plus]
exclude: hooks/

- repo: https://github.com/psf/black
rev: 24.8.0
rev: 24.10.0
hooks:
- id: black

Expand All @@ -48,7 +48,7 @@ repos:
- id: flake8

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

Expand Down
11 changes: 6 additions & 5 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ build:
os: ubuntu-22.04
tools:
python: "3.12"
commands:
- asdf plugin add uv
- asdf install uv latest
- asdf global uv latest
- uv sync --extra docs --no-dev --frozen
- uv run -m sphinx -T -b html -d docs/_build/doctrees -D language=en docs $READTHEDOCS_OUTPUT/html

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

# Declare the Python requirements required to build your docs
python:
install:
- requirements: docs/requirements.txt
172 changes: 172 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,178 @@ All enhancements and patches to Cookiecutter Django will be documented in this f

<!-- GENERATOR_PLACEHOLDER -->

## 2024.10.25


### Updated

- Update werkzeug to 3.0.5 and unpin watchdog&lt;5 ([#5489](https://github.com/cookiecutter/cookiecutter-django/pull/5489))

## 2024.10.24


### Updated

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

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

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

## 2024.10.22


### Changed

- Fix broken links in generated README ([#5482](https://github.com/cookiecutter/cookiecutter-django/pull/5482))

### Updated

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

## 2024.10.21


### Changed

- Remove CELERY_BROKER_URL in favor of REDIS_URL ([#4861](https://github.com/cookiecutter/cookiecutter-django/pull/4861))

### Fixed

- Fix a number of issues with Azure storage ([#5476](https://github.com/cookiecutter/cookiecutter-django/pull/5476))

### Updated

- Update coverage to 7.6.4 ([#5480](https://github.com/cookiecutter/cookiecutter-django/pull/5480))

## 2024.10.17


### Updated

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

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

- Update pillow to 11.0.0 ([#5470](https://github.com/cookiecutter/cookiecutter-django/pull/5470))

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

## 2024.10.15


### Changed

- [pre-commit.ci] pre-commit autoupdate ([#5468](https://github.com/cookiecutter/cookiecutter-django/pull/5468))

## 2024.10.14


### Changed

- Add requirements for ubuntu 24.04 ([#5467](https://github.com/cookiecutter/cookiecutter-django/pull/5467))

### Updated

- Update sphinx to 8.1.3 ([#5463](https://github.com/cookiecutter/cookiecutter-django/pull/5463))

- Update coverage to 7.6.3 ([#5464](https://github.com/cookiecutter/cookiecutter-django/pull/5464))

## 2024.10.12


### Changed

- Pin Python version to 3.12 ([#5456](https://github.com/cookiecutter/cookiecutter-django/pull/5456))

### Updated

- Update sphinx to 8.1.1 ([#5457](https://github.com/cookiecutter/cookiecutter-django/pull/5457))

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

- Update django-cors-headers to 4.5.0 ([#5459](https://github.com/cookiecutter/cookiecutter-django/pull/5459))

## 2024.10.11


### Changed

- Update README.md broken links ([#5454](https://github.com/cookiecutter/cookiecutter-django/pull/5454))

- wait-for-it as dependency in the run stage ([#5452](https://github.com/cookiecutter/cookiecutter-django/pull/5452))

### Updated

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

## 2024.10.10


### Updated

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

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

## 2024.10.09


### Updated

- Update coverage to 7.6.2 ([#5448](https://github.com/cookiecutter/cookiecutter-django/pull/5448))

## 2024.10.08


### Changed

- [pre-commit.ci] pre-commit autoupdate ([#5441](https://github.com/cookiecutter/cookiecutter-django/pull/5441))

### Updated

- Update pre-commit to 4.0.1 ([#5445](https://github.com/cookiecutter/cookiecutter-django/pull/5445))

- Bump amazon/aws-cli from 2.18.0 to 2.18.1 in /{{cookiecutter.project_slug}}/compose/production/aws ([#5443](https://github.com/cookiecutter/cookiecutter-django/pull/5443))

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

## 2024.10.07


### Documentation

- Docs: fix Mailgun include in troubleshooting sections ([#5439](https://github.com/cookiecutter/cookiecutter-django/pull/5439))

### Updated

- Update sphinx to 8.0.2 ([#5263](https://github.com/cookiecutter/cookiecutter-django/pull/5263))

- Update pre-commit to 4.0.0 ([#5432](https://github.com/cookiecutter/cookiecutter-django/pull/5432))

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

- Update sphinx-rtd-theme to 3.0.0 ([#5437](https://github.com/cookiecutter/cookiecutter-django/pull/5437))

- Bump amazon/aws-cli from 2.17.0 to 2.18.0 in /{{cookiecutter.project_slug}}/compose/production/aws ([#5436](https://github.com/cookiecutter/cookiecutter-django/pull/5436))

## 2024.10.05


### Changed

- Replace pip with uv for the project files ([#5356](https://github.com/cookiecutter/cookiecutter-django/pull/5356))

- Use wait-for-it in favor of the custom python script when waiting for postgres ([#5327](https://github.com/cookiecutter/cookiecutter-django/pull/5327))

### Documentation

- Spit docs into sections ([#5426](https://github.com/cookiecutter/cookiecutter-django/pull/5426))

### Updated

- Update crispy-bootstrap5 to 2024.10 ([#5430](https://github.com/cookiecutter/cookiecutter-django/pull/5430))

## 2024.10.04


Expand Down
Loading