Merge pull request #649 from manics/python-3.8

Require min Python 3.8, jupyter-server 2

Author: manics

.github/workflows/build.yml

@@ -8,32 +8,32 @@ jobs:
   # https://github.com/pre-commit/action
   pre-commit:
     name: Lint
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.12'
+          python-version: '3.13'
       - uses: pre-commit/action@v3.0.1
 
   # Due to complications in the build process when trying to support both JupyterLab
   # 2 and 3 we build the pypi packages with JupyterLab 3, but test on 2 and 3
 
   build:
     name: Build dist
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - uses: actions/setup-python@v5
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.10'
+          python-version: '3.13'
           cache: pip
           cache-dependency-path: 'dev-requirements*'
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
-          node-version: '20.x'
+          node-version: '24.x'
           cache: yarn
 
       - name: Install dependencies
@@ -74,28 +74,26 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - python-version: '3.7'
-            jupyterlab-major: '3'
-          - python-version: '3.10'
+          - python-version: '3.8'
             jupyterlab-major: '4'
-          - python-version: '3.12'
+          - python-version: '3.13'
             jupyterlab-major: '4'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     # Includes geckdriver and firefox
     # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip
           cache-dependency-path: 'dev-requirements*'
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
-          node-version: '20.x'
+          node-version: '24.x'
           cache: yarn
 
       - name: Download artifacts from build
@@ -117,41 +115,52 @@ jobs:
       # Only publish if other jobs passed
       - pre-commit
       - test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     permissions:
       id-token: write
     steps:
       - name: Download artifacts from build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: dist
           path: dist
 
       - name: Publish to PyPI
         if: startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@v1.12.4
+        uses: pypa/gh-action-pypi-publish@v1.13.0
 
   # https://docs.github.com/en/actions/language-and-framework-guides/publishing-nodejs-packages#publishing-packages-to-the-npm-registry
   publish-npm:
     needs:
       # Only publish if other jobs passed
       - pre-commit
       - test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
-          node-version: '20.x'
+          node-version: '24.x'
           registry-url: https://registry.npmjs.org
 
+      - name: Should this be set as latest
+        run: |
+          if [[ ${{ github.ref }} =~ ^refs/tags/v?[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            NPM_TAG=latest
+          else
+            NPM_TAG=dev
+          fi
+          echo "NPM_TAG=$NPM_TAG" >> "$GITHUB_ENV"
+
       - name: Download artifacts from build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: jsdist
           path: jsdist
-      - run: npm publish --dry-run ./jsdist/jupyter-offlinenotebook-jlpmpack.tgz
-      - run: npm publish ./jsdist/jupyter-offlinenotebook-jlpmpack.tgz
+
+      - run: npm publish --tag "$NPM_TAG" --dry-run ./jsdist/jupyter-offlinenotebook-jlpmpack.tgz
+
+      - run: npm publish --tag "$NPM_TAG" ./jsdist/jupyter-offlinenotebook-jlpmpack.tgz
         if: startsWith(github.ref, 'refs/tags')
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

dev-requirements-jl3.old

@@ -102,7 +102,7 @@ class OfflineNotebookConfig(Configurable):
     ).tag(config=True)
 
 
-def _jupyter_server_extension_paths():
+def _jupyter_server_extension_points():
     """
     Jupyter server extension
     """
@@ -123,7 +123,7 @@ def _jupyter_nbextension_paths():
     ]
 
 
-def load_jupyter_server_extension(nbapp):
+def _load_jupyter_server_extension(nbapp):
     """
     Called during notebook start
     """
@@ -134,9 +134,3 @@ def load_jupyter_server_extension(nbapp):
         nbapp.web_app.settings["base_url"], "/offlinenotebook/config"
     )
     nbapp.web_app.add_handlers(".*", [(route_pattern, OfflineNotebookHandler)])
-
-
-# Add compatibility with jupyter-server
-# https://jupyter-server.readthedocs.io/en/latest/developers/extensions.html#migrating-an-extension-to-use-jupyter-serverjupyter_server
-_load_jupyter_server_extension = load_jupyter_server_extension
-_jupyter_server_extension_points = _jupyter_server_extension_paths

jupyter_offlinenotebook/__init__.py

@@ -1,6 +1,6 @@
 {
   "name": "jupyter-offlinenotebook",
-  "version": "0.3.2",
+  "version": "0.3.3-dev",
   "description": "JupyterLab offline-notebook extension.",
   "keywords": [
     "jupyter",

package.json

@@ -29,7 +29,7 @@ def get_version():
 jstargets = [
     # notebook
     os.path.join(HERE, name, "static", "jslib", "offlinenotebook.js"),
-    # jupyterlab 3 bundled extension
+    # jupyterlab 4 bundled extension
     os.path.join(HERE, name, "static", "lab", "package.json"),
 ]
 
@@ -91,8 +91,8 @@ def get_version():
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",
     cmdclass=cmdclass,
-    install_requires=["jupyter-server"],
-    python_requires=">=3.7",
+    install_requires=["jupyter-server>=2"],
+    python_requires=">=3.8",
     zip_safe=False,
     include_package_data=True,
     platforms="Linux, Mac OS X, Windows",
@@ -101,12 +101,12 @@ def get_version():
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Framework :: Jupyter",
     ],
 )