Merge branch 'main' into formgrader_jhub41

.github/workflows/check-release.yml

@@ -26,7 +26,7 @@ jobs:
         if: ${{ matrix.group == 'link_check' }}
         uses: jupyter-server/jupyter_releaser/.github/actions/check-links@v1
       - name: Upload Distributions
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: nbgrader-jupyter-releaser-dist-${{ github.run_number }}
           path: .jupyter_releaser_checkout/dist

.github/workflows/test-extensions.yml

@@ -91,7 +91,7 @@ jobs:
           python tasks.py tests --group=${{ matrix.group }}
       - name: Upload Playwright Test report
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: nbgrader-uitests-${{ matrix.group }}-${{ matrix.os }}-python${{ matrix.python }}
           path: |

demos/restart_demo.sh

@@ -70,14 +70,14 @@ install_nbgrader () {
     # Install global extensions, and disable them globally. We will re-enable
     # specific ones for different user accounts in each demo.
     jupyter labextension develop --overwrite .
-    jupyter labextension disable --level=sys_prefix nbgrader:assignment-list
-    jupyter labextension disable --level=sys_prefix nbgrader:formgrader
-    jupyter labextension disable --level=sys_prefix nbgrader:course-list
-    jupyter labextension disable --level=sys_prefix nbgrader:create-assignment
+    jupyter labextension disable --level=sys_prefix @jupyter/nbgrader:assignment-list
+    jupyter labextension disable --level=sys_prefix @jupyter/nbgrader:formgrader
+    jupyter labextension disable --level=sys_prefix @jupyter/nbgrader:course-list
+    jupyter labextension disable --level=sys_prefix @jupyter/nbgrader:create-assignment
     jupyter server extension disable --sys-prefix --py nbgrader
 
     # Everybody gets the validate extension, however.
-    jupyter labextension enable --level=sys_prefix nbgrader:validate-assignment
+    jupyter labextension enable --level=sys_prefix @jupyter/nbgrader:validate-assignment
     jupyter server extension enable --sys-prefix nbgrader.server_extensions.validate_assignment
 
     # Reset exchange.
@@ -114,4 +114,4 @@ restart_demo () {
     jupyterhub
 }
 
-restart_demo "${@}"
+restart_demo "${@}"

demos/utils.sh

@@ -65,17 +65,17 @@ enable_create_assignment () {
     HOME="/home/${USER}"
     local runas="sudo -u ${USER}"
 
-    ${runas} jupyter labextension disable --level=user nbgrader:create-assignment
-    ${runas} jupyter labextension enable --level=user nbgrader:create-assignment
+    ${runas} jupyter labextension disable --level=user @jupyter/nbgrader:create-assignment
+    ${runas} jupyter labextension enable --level=user @jupyter/nbgrader:create-assignment
 }
 
 enable_formgrader () {
     USER="${1}"
     HOME="/home/${USER}"
     local runas="sudo -u ${USER}"
 
-    ${runas} jupyter labextension disable --level=user nbgrader:formgrader
-    ${runas} jupyter labextension enable --level=user nbgrader:formgrader
+    ${runas} jupyter labextension disable --level=user @jupyter/nbgrader:formgrader
+    ${runas} jupyter labextension enable --level=user @jupyter/nbgrader:formgrader
     ${runas} jupyter server extension enable --user nbgrader.server_extensions.formgrader
 }
 
@@ -84,8 +84,8 @@ enable_assignment_list () {
     HOME="/home/${USER}"
     local runas="sudo -u ${USER}"
 
-    ${runas} jupyter labextension disable --level=user nbgrader:assignment-list
-    ${runas} jupyter labextension enable --level=user nbgrader:assignment-list
+    ${runas} jupyter labextension disable --level=user @jupyter/nbgrader:assignment-list
+    ${runas} jupyter labextension enable --level=user @jupyter/nbgrader:assignment-list
     ${runas} jupyter server extension enable --user nbgrader.server_extensions.assignment_list
 }
 
@@ -94,8 +94,8 @@ enable_course_list () {
     HOME="/home/${USER}"
     local runas="sudo -u ${USER}"
 
-    ${runas} jupyter labextension disable --level=user nbgrader:course-list
-    ${runas} jupyter labextension enable --level=user nbgrader:course-list
+    ${runas} jupyter labextension disable --level=user @jupyter/nbgrader:course-list
+    ${runas} jupyter labextension enable --level=user @jupyter/nbgrader:course-list
     ${runas} jupyter server extension enable --user nbgrader.server_extensions.course_list
 }
 
@@ -112,4 +112,4 @@ create_course () {
     ${runas} nbgrader generate_assignment ps1
     ${runas} nbgrader release_assignment ps1
     cd "${currdir}"
-}
+}

nbgrader/docs/source/user_guide/installation.rst

@@ -33,19 +33,19 @@ The server extensions can be disabled individually by running::
 
 The labextensions are all enabled by default, but can be disabled individually by running::
 
-    jupyter labextension disable nbgrader:formgrader
-    jupyter labextension disable nbgrader:assignment-list
-    jupyter labextension disable nbgrader:course-list
-    jupyter labextension disable nbgrader:create-assignment
-    jupyter labextension disable nbgrader:validate-assignment
+    jupyter labextension disable @jupyter/nbgrader:formgrader
+    jupyter labextension disable @jupyter/nbgrader:assignment-list
+    jupyter labextension disable @jupyter/nbgrader:course-list
+    jupyter labextension disable @jupyter/nbgrader:create-assignment
+    jupyter labextension disable @jupyter/nbgrader:validate-assignment
 
 or enabled::
 
-    jupyter labextension enable nbgrader:formgrader
-    jupyter labextension enable nbgrader:assignment-list
-    jupyter labextension enable nbgrader:course-list
-    jupyter labextension enable nbgrader:create-assignment
-    jupyter labextension enable nbgrader:validate-assignment
+    jupyter labextension enable @jupyter/nbgrader:formgrader
+    jupyter labextension enable @jupyter/nbgrader:assignment-list
+    jupyter labextension enable @jupyter/nbgrader:course-list
+    jupyter labextension enable @jupyter/nbgrader:create-assignment
+    jupyter labextension enable @jupyter/nbgrader:validate-assignment
 
 To work properly, the **assignment list**, **formgrader**, **course list** and **validate assignment**
 extensions require both the labextension and server extension. The **create
@@ -65,13 +65,13 @@ There are a number of ways you may need to customize the installation:
 -  To install or enable the labextensions/server extension for just the
    current user, run the above commands with ``--user`` instead of ``--sys-prefix``::
 
-    jupyter labextension enable --level=user nbgrader
+    jupyter labextension enable --level=user @jupyter/nbgrader
     jupyter server extension enable --user --py nbgrader
 
 -  To install or enable the labextensions/server extension for all
    Python installations on the system, run the above commands with ``--system`` instead of ``--sys-prefix``::
 
-    jupyter labextension enable --level=system nbgrader
+    jupyter labextension enable --level=system @jupyter/nbgrader
     jupyter server extension enable --system --py nbgrader
 
 Disabling extensions
@@ -81,21 +81,21 @@ You may want to only install one of the nbgrader extensions. To do this, follow
 the above steps to install everything and then disable the extension you don't
 need. For example, to disable the Assignment List extension::
 
-    jupyter labextension disable --level=sys_prefix nbgrader:assignment-list
+    jupyter labextension disable --level=sys_prefix @jupyter/nbgrader:assignment-list
     jupyter server extension disable --sys-prefix nbgrader.server_extensions.assignment_list
 
 or to disable the Create Assignment extension::
 
-    jupyter labextension disable --level=sys_prefix nbgrader:create-assignment
+    jupyter labextension disable --level=sys_prefix @jupyter/nbgrader:create-assignment
 
 or to disable the Formgrader extension::
 
-    jupyter labextension disable --level=sys_prefix nbgrader:formgrader
+    jupyter labextension disable --level=sys_prefix @jupyter/nbgrader:formgrader
     jupyter server extension disable --sys-prefix nbgrader.server_extensions.formgrader
 
 or to disable the Course List extension::
 
-    jupyter labextension disable --level=sys_prefix nbgrader:course-list
+    jupyter labextension disable --level=sys_prefix @jupyter/nbgrader:course-list
     jupyter server extension disable --sys-prefix nbgrader.server_extensions.course_list
 
 For example lets assume you have installed nbgrader via `Anaconda
@@ -106,12 +106,12 @@ only want the *create assignment* extension available to a specific user and
 not everyone else. First you will need to disable the *create assignment*
 extension for everyone else::
 
-    jupyter labextension disable nbgrader:create-assignment
+    jupyter labextension disable @jupyter/nbgrader:create-assignment
 
 Log in with the specific user and then enable the *create assignment* extension
 only for that user::
 
-    jupyter labextension enable --level=user nbgrader:create-assignment
+    jupyter labextension enable --level=user @jupyter/nbgrader:create-assignment
 
 Finally to see all installed labextensions/server extensions, run::
 

nbgrader/exchange/default/release_feedback.py

@@ -67,9 +67,12 @@ def copy_files(self):
                 submission_secret = fh.read()
 
             checksum = notebook_hash(secret=submission_secret, notebook_id=notebook_id)
-            dest = os.path.join(self.dest_path, "{}.html".format(checksum))
+            dest = os.path.join(self.dest_path, "{}-tmp.html".format(checksum))
 
             self.log.info("Releasing feedback for student '{}' on assignment '{}/{}/{}' ({})".format(
                 student_id, self.coursedir.course_id, self.coursedir.assignment_id, notebook_id, timestamp))
             shutil.copy(html_file, dest)
+            # Copy to temporary location and mv to update atomically.
+            updated_feedback = os.path.join(self.dest_path, "{}.html". format(checksum))
+            shutil.move(dest, updated_feedback)
             self.log.info("Feedback released to: {}".format(dest))

package.json

@@ -109,5 +109,6 @@
     "extension": true,
     "outputDir": "nbgrader/labextension",
     "schemaDir": "schema"
-  }
+  },
+  "packageManager": "yarn@3.5.0"
 }