Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/migrations-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# 'pinned' installs whatever Django version `testing` resolves to under the
# global `Django<6.0` constraint (currently 5.2.x). To test another supported
# version instead, use a value matching a real `djangoNN` dependency-group in
# pyproject.toml (e.g. "42" for the `django42` group), synced below.
# pyproject.toml (e.g. "52" for the `django52` group), synced below.
django-version: ["pinned"]
mongo-version:
- "7"
Expand Down
30 changes: 12 additions & 18 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -235,18 +235,13 @@ development = [
"vulture", # Detects possible dead/unused code, used in scripts/find-dead-code.sh
"watchdog", # Used by `npm run watch` to auto-recompile when assets are changed
]
# Alternate-Django-version test matrix groups. Each is a real, independently-resolved
# environment (not a runtime `uv pip install` patch on top of `testing`) — see
# [tool.uv].conflicts below, which is required for these to coexist in one uv.lock at
# all. Currently unexercised: the CI matrices that would select one of these
# (migrations-check.yml, unit-tests.yml) only ever run with django-version: "pinned",
# which resolves independently via `testing`'s own (unconstrained-except-<6.0) Django
# requirement. If re-enabling that matrix dimension, add the matching fork to
# [tool.uv].conflicts for whichever combination gets exercised together.
django42 = [
{include-group = "testing"},
"django>=4.2,<4.3",
]
# Explicit-Django-version test matrix group. A real, independently-resolved
# environment (not a runtime `uv pip install` patch on top of `testing`). Currently
# unexercised: the CI matrices that would select it (migrations-check.yml,
# unit-tests.yml) only ever run with django-version: "pinned", which resolves
# independently via `testing`'s own (unconstrained-except-<6.0) Django requirement.
# Django 4.2 is no longer tested; its `django42` group was removed. See
# [tool.uv].conflicts below before adding a second version.
django52 = [
{include-group = "testing"},
"django>=5.2,<5.3",
Expand All @@ -258,12 +253,11 @@ ci = [

[tool.uv]
default-groups = [] # explicit, not omitted -- uv's own default-groups fallback is ["dev"]
conflicts = [
[
{ group = "django42" },
{ group = "django52" },
],
]
# Groups that cannot be installed together. Empty while only one explicit Django
# version group exists; if a second `djangoNN` group is added so two versions can be
# tested at once, list them here as one set, e.g. [[{ group = "django52" }, { group = "django60" }]],
# otherwise uv refuses to resolve both into one lock.
conflicts = []

# DO NOT EDIT constraint-dependencies DIRECTLY.
# This list is managed by `edx_lint write_uv_constraints` and will be
Expand Down
Loading
Loading