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.

Sign up for GitHub

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

Bump django from 4.2.16 to 5.1.4 #2198

Closed
wants to merge 3 commits into from
Closed

Bump django from 4.2.16 to 5.1.4 #2198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d60fd8
Bump django from 4.2.16 to 5.1.4
dependabot[bot] Dec 5, 2024
9dc5665
Remove filter warnings
StevenMaude Dec 5, 2024
479ad28
Run django-upgrade with target version 5.1
StevenMaude Dec 5, 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
2 changes: 1 addition & 1 deletion codelists/migrations/0016_auto_20201116_1754.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Migration(migrations.Migration):
migrations.AddConstraint(
model_name="codelist",
constraint=models.CheckConstraint(
check=models.Q(
condition=models.Q(
models.Q(
("organisation_id__isnull", False), ("user_id__isnull", True)
),
Expand Down
2 changes: 1 addition & 1 deletion codelists/migrations/0030_auto_20210412_0947.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Migration(migrations.Migration):
migrations.AddConstraint(
model_name="search",
constraint=models.CheckConstraint(
check=models.Q(
condition=models.Q(
models.Q(("code__isnull", True), ("term__isnull", False)),
models.Q(("code__isnull", False), ("term__isnull", True)),
_connector="OR",
Expand Down
2 changes: 1 addition & 1 deletion codelists/migrations/0033_auto_20210429_1029.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Migration(migrations.Migration):
migrations.AddConstraint(
model_name="handle",
constraint=models.CheckConstraint(
check=models.Q(
condition=models.Q(
models.Q(
("organisation_id__isnull", False), ("user_id__isnull", True)
),
Expand Down
4 changes: 2 additions & 2 deletions codelists/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ class Meta:
constraints = [
models.CheckConstraint(
name="%(app_label)s_%(class)s_organisation_xor_user",
check=(
condition=(
models.Q(organisation_id__isnull=False, user_id__isnull=True)
| models.Q(user_id__isnull=False, organisation_id__isnull=True)
),
Expand Down Expand Up @@ -963,7 +963,7 @@ class Meta:
constraints = [
models.CheckConstraint(
name="%(app_label)s_%(class)s_term_xor_code",
check=(
condition=(
models.Q(term__isnull=False, code__isnull=True)
| models.Q(code__isnull=False, term__isnull=True)
),
Expand Down
4 changes: 0 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ skip_covered = true
DJANGO_SETTINGS_MODULE = "opencodelists.settings"
addopts = "--tb=native --ignore=node_modules --no-migrations"

filterwarnings = [
"ignore::django.utils.deprecation.RemovedInDjango50Warning:rest_framework"
]

[tool.ruff]
line-length = 88
exclude = [
Expand Down
12 changes: 6 additions & 6 deletions requirements.dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
# pip-compile --allow-unsafe --generate-hashes --output-file=requirements.dev.txt requirements.dev.in
#
asgiref==3.6.0 \
--hash=sha256:71e68008da809b957b7ee4b43dbccff33d1b23519fb8344e33f049897077afac \
--hash=sha256:9567dfe7bd8d3c8c892227827c41cce860b368104c3431da67a0c5a65a949506
asgiref==3.8.1 \
--hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \
--hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590
# via
# -c requirements.prod.txt
# django
Expand Down Expand Up @@ -322,9 +322,9 @@ distlib==0.3.9 \
--hash=sha256:47f8c22fd27c27e25a65601af709b38e4f0a45ea4fc2e710f65755fa8caaaf87 \
--hash=sha256:a60f20dea646b8a33f3e7772f74dc0b2d0772d2837ee1342a00645c81edf9403
# via virtualenv
django==4.2.16 \
--hash=sha256:1ddc333a16fc139fd253035a1606bb24261951bbc3a6ca256717fa06cc41a898 \
--hash=sha256:6f1616c2786c408ce86ab7e10f792b8f15742f7b7b7460243929cb371e7f1dad
django==5.1.4 \
--hash=sha256:236e023f021f5ce7dee5779de7b286565fdea5f4ab86bae5338e3f7b69896cf0 \
--hash=sha256:de450c09e91879fa5a307f696e57c851955c910a438a35e6b4c895e86bedc82a
# via
# -c requirements.prod.txt
# django-debug-toolbar
Expand Down
12 changes: 6 additions & 6 deletions requirements.prod.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ antlr4-python3-runtime==4.13.1 \
--hash=sha256:3cd282f5ea7cfb841537fe01f143350fdb1c0b1ce7981443a2fa8513fddb6d1a \
--hash=sha256:78ec57aad12c97ac039ca27403ad61cb98aaec8a3f9bb8144f889aa0fa28b943
# via -r requirements.prod.in
asgiref==3.6.0 \
--hash=sha256:71e68008da809b957b7ee4b43dbccff33d1b23519fb8344e33f049897077afac \
--hash=sha256:9567dfe7bd8d3c8c892227827c41cce860b368104c3431da67a0c5a65a949506
asgiref==3.8.1 \
--hash=sha256:3e1e3ecc849832fe52ccf2cb6686b7a55f82bb1d6aee72a58826471390335e47 \
--hash=sha256:c343bd80a0bec947a9860adb4c432ffa7db769836c64238fc34bdc3fec84d590
# via
# django
# django-cors-headers
Expand Down Expand Up @@ -251,9 +251,9 @@ dj-email-url==1.0.6 \
--hash=sha256:55ffe3329e48f54f8a75aa36ece08f365e09d61f8a209773ef09a1d4760e699a \
--hash=sha256:cbd08327fbb08b104eac160fb4703f375532e4c0243eb230f5b960daee7a96db
# via environs
django==4.2.16 \
--hash=sha256:1ddc333a16fc139fd253035a1606bb24261951bbc3a6ca256717fa06cc41a898 \
--hash=sha256:6f1616c2786c408ce86ab7e10f792b8f15742f7b7b7460243929cb371e7f1dad
django==5.1.4 \
--hash=sha256:236e023f021f5ce7dee5779de7b286565fdea5f4ab86bae5338e3f7b69896cf0 \
--hash=sha256:de450c09e91879fa5a307f696e57c851955c910a438a35e6b4c895e86bedc82a
# via
# -r requirements.prod.in
# crispy-bootstrap4
Expand Down
Loading