Release 0.28.0

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
           - 5432:5432
 
       redis:
-        image: redis:7.4.1
+        image: redis:7.4.2
         ports:
           - 6379:6379
 

.pre-commit-config.yaml

@@ -41,7 +41,7 @@ repos:
             html,
           ]
   - repo: https://github.com/scop/pre-commit-shfmt
-    rev: v3.10.0-1
+    rev: v3.10.0-2
     hooks:
       - id: shfmt
   - repo: https://github.com/adrienverge/yamllint.git
@@ -74,7 +74,7 @@ repos:
           - ".*/generated/"
         additional_dependencies: ["gibberish-detector"]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.7.2"
+    rev: "v0.9.1"
     hooks:
       - id: ruff-format
       - id: ruff

RELEASE.rst

@@ -1,6 +1,23 @@
 Release Notes
 =============
 
+Version 0.28.0
+--------------
+
+- remove two unused entries (#1977)
+- Update dependency litellm to v1.59.0 (#1972)
+- Update dependency ruff to v0.9.2 (#1973)
+- Update dependency bpython to ^0.25 (#1971)
+- Update Node.js to v22.13.0 (#1970)
+- Update redis Docker tag to v7.4.2 (#1969)
+- [pre-commit.ci] pre-commit autoupdate (#1820)
+- fix line clamping of HTML description (#1967)
+- Onboarding Accessibility Improvements (#1960)
+- add proper mocking in drawer v2 tests handling items queries if resource is a program (#1965)
+- add "courses in program" carousel (#1964)
+- Update dependency @storybook/addon-webpack5-compiler-swc to v2 (#1942)
+- Update dependency Django to v4.2.18 [SECURITY] (#1963)
+
 Version 0.27.0 (Released January 16, 2025)
 --------------
 

ai_chat/factories.py

@@ -11,8 +11,8 @@ class ChatMessageFactory(factory.Factory):
 
     role = FuzzyChoice(MessageRole.USER, MessageRole.ASSISTANT)
     content = factory.Faker("sentence")
-    id = name = factory.Sequence(lambda n: "%d" % n)
-    index = factory.Sequence(lambda n: "%d" % n)
+    id = name = factory.Sequence(lambda n: str(n))
+    index = factory.Sequence(lambda n: str(n))
 
     class Meta:
         model = ChatMessage

authentication/middleware.py

@@ -38,7 +38,7 @@ def process_exception(self, request, exception):
 
             if url:
                 url += (
-                    "?" in url and "&" or "?"
+                    ("?" in url and "&") or "?"
                 ) + f"message={quote(message)}&backend={backend_name}"
                 return redirect(url)
             return None

channels/serializers_test.py

@@ -155,7 +155,7 @@ def test_create_channel(base_channel_data, channel_detail, channel_type):
     """
     paths = sorted(
         (p.learning_resource for p in LearningPathFactory.create_batch(2)),
-        key=lambda list: list.id,  # noqa: A002
+        key=lambda lst: lst.id,
         reverse=True,
     )
 

conftest.py

@@ -11,7 +11,7 @@
 
 
 @pytest.fixture(autouse=True)
-def prevent_requests(mocker, request):  # noqa: PT004
+def prevent_requests(mocker, request):
     """Patch requests to error on request by default"""
     if "mocked_responses" in request.fixturenames:
         return

docker-compose.apps.yml

@@ -30,7 +30,7 @@ services:
     profiles:
       - frontend
     working_dir: /src
-    image: node:22.12
+    image: node:22.13
     entrypoint: ["/bin/sh", "-c"]
     command:
       - |

docker-compose.services.yml

@@ -23,7 +23,7 @@ services:
   redis:
     profiles:
       - backend
-    image: redis:7.4.1
+    image: redis:7.4.2
     healthcheck:
       test: ["CMD", "redis-cli", "ping", "|", "grep", "PONG"]
       interval: 3s

fixtures/aws.py

@@ -10,13 +10,13 @@
 
 
 @pytest.fixture(autouse=True)
-def silence_s3_logging():  # noqa: PT004
+def silence_s3_logging():
     """Only show S3 errors"""
     logging.getLogger("botocore").setLevel(logging.ERROR)
 
 
 @pytest.fixture
-def mock_s3_fixture():  # noqa: PT004
+def mock_s3_fixture():
     """Mock the S3 fixture for the duration of the test"""
     with mock_aws():
         yield

fixtures/common.py

@@ -22,13 +22,13 @@
 
 
 @pytest.fixture(autouse=True)
-def silence_factory_logging():  # noqa: PT004
+def silence_factory_logging():
     """Only show factory errors"""
     logging.getLogger("factory").setLevel(logging.ERROR)
 
 
 @pytest.fixture(autouse=True)
-def warnings_as_errors():  # noqa: PT004
+def warnings_as_errors():
     """
     Convert warnings to errors. This should only affect unit tests, letting pylint and other plugins
     raise DeprecationWarnings without erroring.
@@ -53,7 +53,7 @@ def warnings_as_errors():  # noqa: PT004
 
 
 @pytest.fixture
-def randomness():  # noqa: PT004
+def randomness():
     """Ensure a fixed seed for factoryboy"""
     factory.fuzzy.reseed_random("happy little clouds")
 
@@ -95,7 +95,7 @@ def mocked_responses():
 
 
 @pytest.fixture
-def offeror_featured_lists():  # noqa: PT004
+def offeror_featured_lists():
     """Generate featured offeror lists for testing"""
     for offered_by in OfferedBy.names():
         offeror = LearningResourceOfferorFactory.create(code=offered_by)

frontends/api/src/hooks/learningResources/keyFactory.ts

@@ -8,6 +8,7 @@ import {
   schoolsApi,
   featuredApi,
 } from "../../clients"
+import axiosInstance from "../../axios"
 import type {
   LearningResource,
   LearningResourcesApiLearningResourcesListRequest as LearningResourcesListRequest,
@@ -16,6 +17,8 @@ import type {
   OfferorsApiOfferorsListRequest,
   PlatformsApiPlatformsListRequest,
   FeaturedApiFeaturedListRequest as FeaturedListParams,
+  LearningResourcesApiLearningResourcesItemsListRequest as ItemsListRequest,
+  PaginatedLearningResourceRelationshipList,
 } from "../../generated/v1"
 
 const shuffle = ([...arr]) => {
@@ -63,13 +66,34 @@ export const clearListMemberships = (resource: LearningResource) => ({
 
 const learningResources = createQueryKeys("learningResources", {
   detail: (id: number) => ({
-    queryKey: [id],
+    queryKey: ["detail", id],
     queryFn: async () => {
       const { data } = await learningResourcesApi.learningResourcesRetrieve({
         id,
       })
       return clearListMemberships(data)
     },
+    contextQueries: {
+      items: (itemsP: ItemsListRequest) => ({
+        queryKey: [itemsP],
+        queryFn: async ({ pageParam }: { pageParam?: string } = {}) => {
+          // Use generated API for first request, then use next parameter
+          const request = pageParam
+            ? axiosInstance.request<PaginatedLearningResourceRelationshipList>({
+                method: "get",
+                url: pageParam,
+              })
+            : learningResourcesApi.learningResourcesItemsList(itemsP)
+          const { data } = await request
+          return {
+            ...data,
+            results: data.results.map((relation) => ({
+              ...clearListMemberships(relation.resource),
+            })),
+          }
+        },
+      }),
+    },
   }),
   list: (params: LearningResourcesListRequest) => ({
     queryKey: [params],

frontends/api/src/test-utils/urls.ts

@@ -78,6 +78,8 @@ const learningResources = {
     `${API_BASE_URL}/api/v1/learning_resources/${query(params)}`,
   details: (params: Params<LRApi, "learningResourcesRetrieve">) =>
     `${API_BASE_URL}/api/v1/learning_resources/${params.id}/`,
+  items: (params: Params<LRApi, "learningResourcesRetrieve">) =>
+    `${API_BASE_URL}/api/v1/learning_resources/${params.id}/items/`,
   featured: (params?: Params<FeaturedApi, "featuredList">) =>
     `${API_BASE_URL}/api/v1/featured/${query(params)}`,
   similar: (params: Params<LRApi, "learningResourcesSimilarList">) =>