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 openedx_learning/apps/authoring/backup_restore/zipper.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def get_publishable_entities(self) -> QuerySet[PublishableEntity]:
lp_id = self.learning_package.pk
publishable_entities: QuerySet[PublishableEntity] = publishing_api.get_publishable_entities(lp_id)
return (
publishable_entities
publishable_entities # type: ignore[no-redef]
.select_related(
"container",
"component__component_type",
Expand Down
12 changes: 7 additions & 5 deletions openedx_tagging/core/tagging/models/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ def _get_filtered_tags_free_text(
if include_counts:
return qs.annotate(usage_count=models.Count("value"))
else:
return qs.distinct()
return qs.distinct() # type: ignore[return-value]

def _get_filtered_tags_one_level(
self,
Expand All @@ -486,12 +486,14 @@ def _get_filtered_tags_one_level(
# Use parent_tag.value not parent_tag_value because they may differ in case
qs = qs.annotate(parent_value=Value(parent_tag.value))
else:
qs = self.tag_set.filter(parent=None).annotate(depth=Value(0))
qs = self.tag_set.filter(parent=None).annotate(depth=Value(0)) # type: ignore[no-redef]
qs = qs.annotate(parent_value=Value(None, output_field=models.CharField()))
qs = qs.annotate(child_count=models.Count("children", distinct=True))
qs = qs.annotate(child_count=models.Count("children", distinct=True)) # type: ignore[no-redef]
qs = qs.annotate(grandchild_count=models.Count("children__children", distinct=True))
qs = qs.annotate(great_grandchild_count=models.Count("children__children__children"))
qs = qs.annotate(descendant_count=F("child_count") + F("grandchild_count") + F("great_grandchild_count"))
qs = qs.annotate(
descendant_count=F("child_count") + F("grandchild_count") + F("great_grandchild_count")
) # type: ignore[no-redef]
# Filter by search term:
if search_term:
qs = qs.filter(value__icontains=search_term)
Expand Down Expand Up @@ -597,7 +599,7 @@ def _get_filtered_tags_deep(
count=models.Func(F('id'), function='Count')
)
qs = qs.annotate(usage_count=models.Subquery(obj_tags.values('count')))
return qs
return qs # type: ignore[return-value]

def add_tag(
self,
Expand Down
8 changes: 4 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ celery==5.5.3
# via -r requirements/base.in
certifi==2025.8.3
# via requests
cffi==1.17.1
cffi==2.0.0
# via
# cryptography
# pynacl
Expand Down Expand Up @@ -78,15 +78,15 @@ prompt-toolkit==3.0.52
# via click-repl
psutil==7.0.0
# via edx-django-utils
pycparser==2.22
pycparser==2.23
# via cffi
pyjwt[crypto]==2.10.1
# via
# drf-jwt
# edx-drf-extensions
pymongo==4.14.1
pymongo==4.15.0
# via edx-opaque-keys
pynacl==1.5.0
pynacl==1.6.0
# via edx-django-utils
python-dateutil==2.9.0.post0
# via celery
Expand Down
20 changes: 10 additions & 10 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ certifi==2025.8.3
# via
# -r requirements/quality.txt
# requests
cffi==1.17.1
cffi==2.0.0
# via
# -r requirements/quality.txt
# cryptography
Expand Down Expand Up @@ -137,11 +137,11 @@ django-debug-toolbar==6.0.0
# via
# -r requirements/dev.in
# -r requirements/quality.txt
django-stubs==5.2.2
django-stubs==5.2.5
# via
# -r requirements/quality.txt
# djangorestframework-stubs
django-stubs-ext==5.2.2
django-stubs-ext==5.2.5
# via
# -r requirements/quality.txt
# django-stubs
Expand Down Expand Up @@ -278,7 +278,7 @@ more-itertools==10.8.0
# -r requirements/quality.txt
# jaraco-classes
# jaraco-functools
mypy==1.17.1
mypy==1.18.1
# via -r requirements/quality.txt
mypy-extensions==1.1.0
# via
Expand Down Expand Up @@ -336,7 +336,7 @@ psutil==7.0.0
# edx-django-utils
pycodestyle==2.14.0
# via -r requirements/quality.txt
pycparser==2.22
pycparser==2.23
# via
# -r requirements/quality.txt
# cffi
Expand Down Expand Up @@ -374,11 +374,11 @@ pylint-plugin-utils==0.9.0
# -r requirements/quality.txt
# pylint-celery
# pylint-django
pymongo==4.14.1
pymongo==4.15.0
# via
# -r requirements/quality.txt
# edx-opaque-keys
pynacl==1.5.0
pynacl==1.6.0
# via
# -r requirements/quality.txt
# edx-django-utils
Expand All @@ -396,7 +396,7 @@ pytest==8.4.2
# -r requirements/quality.txt
# pytest-cov
# pytest-django
pytest-cov==6.3.0
pytest-cov==7.0.0
# via -r requirements/quality.txt
pytest-django==4.11.1
# via -r requirements/quality.txt
Expand Down Expand Up @@ -440,7 +440,7 @@ rich==14.1.0
# twine
rules==3.5
# via -r requirements/quality.txt
secretstorage==3.3.3
secretstorage==3.4.0
# via
# -r requirements/quality.txt
# keyring
Expand Down Expand Up @@ -485,7 +485,7 @@ types-pyyaml==6.0.12.20250822
# -r requirements/quality.txt
# django-stubs
# djangorestframework-stubs
types-requests==2.32.4.20250809
types-requests==2.32.4.20250913
# via
# -r requirements/quality.txt
# djangorestframework-stubs
Expand Down
18 changes: 9 additions & 9 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ certifi==2025.8.3
# via
# -r requirements/test.txt
# requests
cffi==1.17.1
cffi==2.0.0
# via
# -r requirements/test.txt
# cryptography
Expand Down Expand Up @@ -97,11 +97,11 @@ django-crum==0.7.9
# edx-django-utils
django-debug-toolbar==6.0.0
# via -r requirements/test.txt
django-stubs==5.2.2
django-stubs==5.2.5
# via
# -r requirements/test.txt
# djangorestframework-stubs
django-stubs-ext==5.2.2
django-stubs-ext==5.2.5
# via
# -r requirements/test.txt
# django-stubs
Expand Down Expand Up @@ -177,7 +177,7 @@ markupsafe==3.0.2
# jinja2
mock==5.2.0
# via -r requirements/test.txt
mypy==1.17.1
mypy==1.18.1
# via -r requirements/test.txt
mypy-extensions==1.1.0
# via
Expand Down Expand Up @@ -213,7 +213,7 @@ psutil==7.0.0
# via
# -r requirements/test.txt
# edx-django-utils
pycparser==2.22
pycparser==2.23
# via
# -r requirements/test.txt
# cffi
Expand All @@ -233,11 +233,11 @@ pyjwt[crypto]==2.10.1
# -r requirements/test.txt
# drf-jwt
# edx-drf-extensions
pymongo==4.14.1
pymongo==4.15.0
# via
# -r requirements/test.txt
# edx-opaque-keys
pynacl==1.5.0
pynacl==1.6.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand All @@ -246,7 +246,7 @@ pytest==8.4.2
# -r requirements/test.txt
# pytest-cov
# pytest-django
pytest-cov==6.3.0
pytest-cov==7.0.0
# via -r requirements/test.txt
pytest-django==4.11.1
# via -r requirements/test.txt
Expand Down Expand Up @@ -334,7 +334,7 @@ types-pyyaml==6.0.12.20250822
# -r requirements/test.txt
# django-stubs
# djangorestframework-stubs
types-requests==2.32.4.20250809
types-requests==2.32.4.20250913
# via
# -r requirements/test.txt
# djangorestframework-stubs
Expand Down
20 changes: 10 additions & 10 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ certifi==2025.8.3
# via
# -r requirements/test.txt
# requests
cffi==1.17.1
cffi==2.0.0
# via
# -r requirements/test.txt
# cryptography
Expand Down Expand Up @@ -101,11 +101,11 @@ django-crum==0.7.9
# edx-django-utils
django-debug-toolbar==6.0.0
# via -r requirements/test.txt
django-stubs==5.2.2
django-stubs==5.2.5
# via
# -r requirements/test.txt
# djangorestframework-stubs
django-stubs-ext==5.2.2
django-stubs-ext==5.2.5
# via
# -r requirements/test.txt
# django-stubs
Expand Down Expand Up @@ -203,7 +203,7 @@ more-itertools==10.8.0
# via
# jaraco-classes
# jaraco-functools
mypy==1.17.1
mypy==1.18.1
# via -r requirements/test.txt
mypy-extensions==1.1.0
# via
Expand Down Expand Up @@ -240,7 +240,7 @@ psutil==7.0.0
# edx-django-utils
pycodestyle==2.14.0
# via -r requirements/quality.in
pycparser==2.22
pycparser==2.23
# via
# -r requirements/test.txt
# cffi
Expand Down Expand Up @@ -271,11 +271,11 @@ pylint-plugin-utils==0.9.0
# via
# pylint-celery
# pylint-django
pymongo==4.14.1
pymongo==4.15.0
# via
# -r requirements/test.txt
# edx-opaque-keys
pynacl==1.5.0
pynacl==1.6.0
# via
# -r requirements/test.txt
# edx-django-utils
Expand All @@ -284,7 +284,7 @@ pytest==8.4.2
# -r requirements/test.txt
# pytest-cov
# pytest-django
pytest-cov==6.3.0
pytest-cov==7.0.0
# via -r requirements/test.txt
pytest-django==4.11.1
# via -r requirements/test.txt
Expand Down Expand Up @@ -319,7 +319,7 @@ rich==14.1.0
# via twine
rules==3.5
# via -r requirements/test.txt
secretstorage==3.3.3
secretstorage==3.4.0
# via keyring
semantic-version==2.10.0
# via
Expand Down Expand Up @@ -358,7 +358,7 @@ types-pyyaml==6.0.12.20250822
# -r requirements/test.txt
# django-stubs
# djangorestframework-stubs
types-requests==2.32.4.20250809
types-requests==2.32.4.20250913
# via
# -r requirements/test.txt
# djangorestframework-stubs
Expand Down
18 changes: 9 additions & 9 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ certifi==2025.8.3
# via
# -r requirements/base.txt
# requests
cffi==1.17.1
cffi==2.0.0
# via
# -r requirements/base.txt
# cryptography
Expand Down Expand Up @@ -85,11 +85,11 @@ django-crum==0.7.9
# edx-django-utils
django-debug-toolbar==6.0.0
# via -r requirements/test.in
django-stubs==5.2.2
django-stubs==5.2.5
# via
# -r requirements/test.in
# djangorestframework-stubs
django-stubs-ext==5.2.2
django-stubs-ext==5.2.5
# via django-stubs
django-waffle==5.0.0
# via
Expand Down Expand Up @@ -143,7 +143,7 @@ markupsafe==3.0.2
# via jinja2
mock==5.2.0
# via -r requirements/test.in
mypy==1.17.1
mypy==1.18.1
# via -r requirements/test.in
mypy-extensions==1.1.0
# via mypy
Expand All @@ -168,7 +168,7 @@ psutil==7.0.0
# via
# -r requirements/base.txt
# edx-django-utils
pycparser==2.22
pycparser==2.23
# via
# -r requirements/base.txt
# cffi
Expand All @@ -179,11 +179,11 @@ pyjwt[crypto]==2.10.1
# -r requirements/base.txt
# drf-jwt
# edx-drf-extensions
pymongo==4.14.1
pymongo==4.15.0
# via
# -r requirements/base.txt
# edx-opaque-keys
pynacl==1.5.0
pynacl==1.6.0
# via
# -r requirements/base.txt
# edx-django-utils
Expand All @@ -192,7 +192,7 @@ pytest==8.4.2
# -r requirements/test.in
# pytest-cov
# pytest-django
pytest-cov==6.3.0
pytest-cov==7.0.0
# via -r requirements/test.in
pytest-django==4.11.1
# via -r requirements/test.in
Expand Down Expand Up @@ -239,7 +239,7 @@ types-pyyaml==6.0.12.20250822
# via
# django-stubs
# djangorestframework-stubs
types-requests==2.32.4.20250809
types-requests==2.32.4.20250913
# via djangorestframework-stubs
typing-extensions==4.15.0
# via
Expand Down