Fix lint and format

Author: karenrasmussen

lms/migrations/versions/2a45f5cb8e25_add_assignment_due_date.py

@@ -1,19 +1,19 @@
-"""add_assignment_due_date
+"""Add assignment due date.
 
 Revision ID: 2a45f5cb8e25
 Revises: af090ca7e73f
 """
-from alembic import op
-import sqlalchemy as sa
 
+import sqlalchemy as sa
+from alembic import op
 
-revision = '2a45f5cb8e25'
-down_revision = 'af090ca7e73f'
+revision = "2a45f5cb8e25"
+down_revision = "af090ca7e73f"
 
 
 def upgrade() -> None:
-    op.add_column('assignment', sa.Column('due_date', sa.DateTime(), nullable=True))
+    op.add_column("assignment", sa.Column("due_date", sa.DateTime(), nullable=True))
 
 
 def downgrade() -> None:
-    op.drop_column('assignment', 'due_date')
+    op.drop_column("assignment", "due_date")

lms/product/canvas/product.py

@@ -25,7 +25,7 @@ class Canvas(Product):
 
     settings_key = "canvas"
 
-    use_toolbar_grading = False 
+    use_toolbar_grading = False
     """We use SpeedGrader in canvas instead"""
     use_toolbar_editing = False
     """Canvas allows re-deeplinking assignments. We don't support editing in our side."""

lms/resources/_js_config/__init__.py

@@ -480,10 +480,12 @@ def enable_toolbar_checkpoint(self, assignment):
             # reveal_date is stored as UTC without timezone info. Adding
             # UTC here so the ISO string includes +00:00 and the browser
             # can convert it to the user's local timezone.
-            "revealDate": assignment.checkpoint.reveal_date.replace(tzinfo=UTC).isoformat()
+            "revealDate": assignment.checkpoint.reveal_date.replace(
+                tzinfo=UTC
+            ).isoformat()
             if assignment.checkpoint.reveal_date
             else None,
-            # TODO: use actual due date once available; for now reuse reveal_date.
+            # Use actual due date once available; for now reuse reveal_date.
             "dueDate": assignment.checkpoint.reveal_date.replace(tzinfo=UTC).isoformat()
             if assignment.checkpoint.reveal_date
             else None,
@@ -497,7 +499,7 @@ def enable_student_checkpoint(self, assignment):
         revealed = assignment.checkpoint.reveal_date is not None
         self._config["studentCheckpoint"] = {
             "hidden": not revealed,
-            # TODO: use actual due date once available; for now reuse reveal_date.
+            # Use actual due date once available; for now reuse reveal_date.
             # reveal_date is stored as UTC without timezone info. Adding
             # UTC here so the ISO string includes +00:00 and the browser
             # can convert it to the user's local timezone.

lms/views/api/checkpoint.py

@@ -26,7 +26,12 @@ def reveal_checkpoint(request):
         return {"error": "Assignment or checkpoint not found"}
 
     if assignment.checkpoint.reveal_date:
-        return {"revealed": True, "reveal_date": assignment.checkpoint.reveal_date.replace(tzinfo=UTC).isoformat()}
+        return {
+            "revealed": True,
+            "reveal_date": assignment.checkpoint.reveal_date.replace(
+                tzinfo=UTC
+            ).isoformat(),
+        }
 
     # Set the reveal date on the LMS side (source of truth)
     assignment.checkpoint.reveal_date = datetime.utcnow()  # noqa: DTZ003

tests/unit/lms/resources/_js_config/__init___test.py

@@ -1,4 +1,4 @@
-from datetime import timedelta
+from datetime import datetime, timedelta
 from unittest.mock import MagicMock, create_autospec, patch, sentinel
 
 import pytest
@@ -619,8 +619,6 @@ def test_enable_toolbar_checkpoint_unrevealed(self, js_config):
         assert "revealUrl" in checkpoint
 
     def test_enable_toolbar_checkpoint_revealed(self, js_config):
-        from datetime import datetime
-
         assignment = MagicMock()
         assignment.checkpoint.reveal_date = datetime(2026, 7, 1, 12, 0, 0)  # noqa: DTZ001
         assignment.id = 42
@@ -644,8 +642,6 @@ def test_enable_student_checkpoint_hidden(self, js_config):
         assert config["studentCheckpoint"]["dueDate"] is None
 
     def test_enable_student_checkpoint_revealed(self, js_config):
-        from datetime import datetime
-
         assignment = MagicMock()
         assignment.checkpoint.reveal_date = datetime(2026, 7, 1, 12, 0, 0)  # noqa: DTZ001
 

tests/unit/lms/views/api/checkpoint_test.py

@@ -1,23 +1,23 @@
 from datetime import datetime
-from unittest.mock import MagicMock, create_autospec, sentinel
+from unittest.mock import MagicMock
 
 import pytest
 
-from lms.models.assignment import Assignment
-from lms.models.assignment_checkpoint import AssignmentCheckpoint
+from lms.services import HAPI
 from lms.views.api.checkpoint import reveal_checkpoint
 
 
-@pytest.mark.usefixtures("assignment_service", "h_api", "user_is_instructor")
+@pytest.mark.usefixtures("assignment_service", "h_api")
 class TestRevealCheckpoint:
-    def test_it_rejects_non_instructors(self, pyramid_request, user_is_learner):
+    def test_it_rejects_non_instructors(self, pyramid_request):
         pyramid_request.matchdict = {"assignment_id": "1"}
 
         result = reveal_checkpoint(pyramid_request)
 
         assert pyramid_request.response.status_code == 403
         assert "error" in result
 
+    @pytest.mark.usefixtures("user_is_instructor")
     def test_it_reveals_an_unrevealed_checkpoint(
         self, pyramid_request, assignment_service, h_api
     ):
@@ -32,6 +32,7 @@ def test_it_reveals_an_unrevealed_checkpoint(
         assert "reveal_date" in result
         h_api.sync_checkpoints.assert_called_once()
 
+    @pytest.mark.usefixtures("user_is_instructor")
     def test_it_returns_already_revealed(
         self, pyramid_request, assignment_service, h_api
     ):
@@ -47,6 +48,7 @@ def test_it_returns_already_revealed(
         assert "reveal_date" in result
         h_api.sync_checkpoints.assert_not_called()
 
+    @pytest.mark.usefixtures("user_is_instructor")
     def test_it_returns_404_when_assignment_not_found(
         self, pyramid_request, assignment_service
     ):
@@ -58,6 +60,7 @@ def test_it_returns_404_when_assignment_not_found(
         assert pyramid_request.response.status_code == 404
         assert "error" in result
 
+    @pytest.mark.usefixtures("user_is_instructor")
     def test_it_returns_404_when_no_checkpoint(
         self, pyramid_request, assignment_service
     ):
@@ -71,6 +74,7 @@ def test_it_returns_404_when_no_checkpoint(
         assert pyramid_request.response.status_code == 404
         assert "error" in result
 
+    @pytest.mark.usefixtures("user_is_instructor")
     def test_it_syncs_checkpoints_to_h(
         self, pyramid_request, assignment_service, h_api
     ):
@@ -89,8 +93,11 @@ def test_it_syncs_checkpoints_to_h(
         assert call_kwargs["authority"] == "lms.hypothes.is"
         assert len(call_kwargs["checkpoints"]) == 1
         assert call_kwargs["checkpoints"][0]["group_authority_provided_id"] == "group1"
-        assert call_kwargs["checkpoints"][0]["document_uri"] == "https://example.com/doc"
+        assert (
+            call_kwargs["checkpoints"][0]["document_uri"] == "https://example.com/doc"
+        )
 
+    @pytest.mark.usefixtures("user_is_instructor")
     def test_it_does_not_sync_when_no_groupings(
         self, pyramid_request, assignment_service, h_api
     ):
@@ -116,8 +123,6 @@ def _assignment_with_checkpoint(self, reveal_date):
 
     @pytest.fixture
     def h_api(self, mock_service):
-        from lms.services import HAPI
-
         return mock_service(HAPI)
 
     @pytest.fixture

tests/unit/lms/views/lti/basic_launch_test.py

@@ -399,8 +399,9 @@ def test__show_document_configures_toolbar(
 
         assert result == {}
 
+    @pytest.mark.usefixtures("pyramid_request")
     def test__show_document_enables_checkpoint_toolbar_for_instructor(
-        self, svc, request, context, pyramid_request
+        self, svc, request, context
     ):
         request.getfixturevalue("user_is_instructor")
         assignment = factories.Assignment()
@@ -413,9 +414,8 @@ def test__show_document_enables_checkpoint_toolbar_for_instructor(
         context.js_config.enable_toolbar_checkpoint.assert_called_once_with(assignment)
         context.js_config.enable_student_checkpoint.assert_not_called()
 
-    def test__show_document_enables_student_checkpoint_for_student(
-        self, svc, context, pyramid_request
-    ):
+    @pytest.mark.usefixtures("pyramid_request")
+    def test__show_document_enables_student_checkpoint_for_student(self, svc, context):
         assignment = factories.Assignment()
         with mock.patch.object(
             type(assignment), "checkpoint", new_callable=mock.PropertyMock
@@ -426,9 +426,8 @@ def test__show_document_enables_student_checkpoint_for_student(
         context.js_config.enable_student_checkpoint.assert_called_once_with(assignment)
         context.js_config.enable_toolbar_checkpoint.assert_not_called()
 
-    def test__show_document_no_checkpoint_config_without_checkpoint(
-        self, svc, context, pyramid_request
-    ):
+    @pytest.mark.usefixtures("pyramid_request")
+    def test__show_document_no_checkpoint_config_without_checkpoint(self, svc, context):
         assignment = factories.Assignment()
 
         svc._show_document(assignment)  # noqa: SLF001