Merge pull request #54 from jtpio/resource-usage

Depend on jupyter-resource-usage

Author: jtpio

.github/workflows/build.yml

@@ -27,7 +27,6 @@ jobs:
     - name: Install JupyterLab
       run: |
         python -m pip install jupyterlab --pre
-        python -m pip install nbresuse
 
     - name: Install the extension
       run: |

.github/workflows/packaging.yml

@@ -0,0 +1,95 @@
+name: Packaging
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: '*'
+
+env:
+  PIP_DISABLE_PIP_VERSION_CHECK: 1
+
+defaults:
+  run:
+    shell: bash -l {0}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Install node
+      uses: actions/setup-node@v1
+      with:
+       node-version: '14.x'
+    - name: Install Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.9'
+        architecture: 'x64'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip wheel
+        python -m pip install setuptools jupyter_packaging "jupyterlab>=3,<4"
+    - name: Build pypi distributions
+      run: |
+        python setup.py sdist bdist_wheel
+    - name: Build npm distributions
+      run: |
+        jlpm lerna exec -- npm pack
+        cp packages/*/*.tgz dist
+    - name: Build checksum file
+      run: |
+        cd dist
+        sha256sum * | tee SHA256SUMS
+    - name: Upload distributions
+      uses: actions/upload-artifact@v2
+      with:
+        name: dist ${{ github.run_number }}
+        path: ./dist
+
+  install:
+    runs-on: ${{ matrix.os }}-latest
+    needs: [build]
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu, macos, windows]
+        python: ['3.6', '3.9']
+        include:
+          - python: '3.6'
+            dist: 'jupyterlab-system-monitor*.tar.gz'
+          - python: '3.9'
+            dist: 'jupyterlab_system_monitor*.whl'
+          - os: windows
+            py_cmd: python
+          - os: macos
+            py_cmd: python3
+          - os: ubuntu
+            py_cmd: python
+    steps:
+      - name: Install Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python }}
+          architecture: 'x64'
+      - uses: actions/download-artifact@v2
+        with:
+          name: dist ${{ github.run_number }}
+          path: ./dist
+      - name: Install the prerequisites
+        run: |
+          ${{ matrix.py_cmd }} -m pip install pip wheel
+      - name: Install the package
+        run: |
+          cd dist
+          ${{ matrix.py_cmd }} -m pip install -vv ${{ matrix.dist }}
+      - name: Validate environment
+        run: |
+          ${{ matrix.py_cmd }} -m pip freeze
+          ${{ matrix.py_cmd }} -m pip check
+      - name: Validate the install
+        run: |
+          jupyter labextension list
+          jupyter labextension list 2>&1 | grep -ie "jupyterlab-system-monitor.*enabled.*ok" -

README.md

@@ -6,7 +6,7 @@
 
 JupyterLab extension to display system information (memory and cpu usage).
 
-Provides an alternative frontend for the `nbresuse` metrics: [https://github.com/yuvipanda/nbresuse](https://github.com/yuvipanda/nbresuse)
+Provides an alternative frontend for the `jupyter-resource-usage` metrics: [https://github.com/jupyter-server/jupyter-resource-usage](https://github.com/jupyter-server/jupyter-resource-usage)
 
 ![screencast](./doc/screencast.gif)
 
@@ -24,7 +24,7 @@ This extension was originally developed as part of the [jupyterlab-topbar](https
 
 ## Installation
 
-This extension requires the `nbresuse` package and the `jupyterlab-topbar-extension` extension for JupyterLab.
+This extension requires the `jupyter-resource-usage` package and the `jupyterlab-topbar-extension` extension for JupyterLab.
 
 **Note: This extension is not compatible with `nbresuse==0.3.4`**.
 
@@ -61,7 +61,7 @@ conda install -c conda-forge nodejs
 
 You can set the memory and cpu limits (but not enforce it) to display the indicator in the top bar.
 
-For more info, check the [memory limit](https://github.com/yuvipanda/nbresuse#memory-limit) in the [nbresuse](https://github.com/yuvipanda/nbresuse) repository.
+For more info, check the [memory limit](https://github.com/jupyter-server/jupyter-resource-usage#memory-limit) in the [nbresuse](https://github.com/jupyter-server/jupyter-resource-usage) repository.
 
 Edit `~/.jupyter/jupyter_notebook_config.py` (note: see [here](https://jupyter-notebook.readthedocs.io/en/stable/config.html#config-file-and-command-line-options) if you do not have a config file:
 
@@ -101,7 +101,7 @@ You can change the label and refresh rate in JupyterLab's advanced settings edit
 
 ## Troubleshooting
 
-If you are experiencing issues with the memory and cpu indicators not being displayed, make sure to check the [nbresuse changelog](https://github.com/yuvipanda/nbresuse/blob/master/CHANGELOG.md) for any breaking changes from major releases.
+If you are experiencing issues with the memory and cpu indicators not being displayed, make sure to check the [nbresuse changelog](https://github.com/jupyter-server/jupyter-resource-usage/blob/master/CHANGELOG.md) for any breaking changes from major releases.
 
 ## Development
 

binder/environment.yml

@@ -3,6 +3,6 @@ channels:
 - conda-forge
 dependencies:
 - python=3
-- jupyterlab=2
-- nbresuse=0.3.6
+- jupyterlab=3
+- jupyter-resource-usage=0.5
 - nodejs

packages/system-monitor/package.json

@@ -64,7 +64,7 @@
           "conda"
         ],
         "base": {
-          "name": "nbresuse"
+          "name": "jupyter-resource-usage"
         }
       }
     },

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["jupyter_packaging~=0.7.0", "jupyterlab>=3.0.0rc10,==3.*", "setuptools>=40.8.0", "wheel"]
+requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0rc10,==3.*", "setuptools>=40.8.0", "wheel"]
 build-backend = "setuptools.build_meta"

setup.py

@@ -1,12 +1,11 @@
 """
 jupyterlab-system-monitor setup
 """
-import json
 import os
 
 from jupyter_packaging import (
     create_cmdclass, install_npm, ensure_targets,
-    combine_commands, get_version,
+    combine_commands, get_version, skip_if_exists
 )
 import setuptools
 
@@ -21,7 +20,6 @@
 
 # Representative files that should exist after a successful build
 jstargets = [
-    os.path.join(HERE, "packages", "system-monitor", "lib", "index.js"),
     os.path.join(lab_path, "package.json"),
 ]
 
@@ -43,11 +41,17 @@
     data_files_spec=data_files_spec
 )
 
-cmdclass["jsdeps"] = combine_commands(
+js_command = combine_commands(
     install_npm(HERE, build_cmd="build:prod", npm=["jlpm"]),
     ensure_targets(jstargets),
 )
 
+is_repo = os.path.exists(os.path.join(HERE, ".git"))
+if is_repo:
+    cmdclass["jsdeps"] = js_command
+else:
+    cmdclass["jsdeps"] = skip_if_exists(jstargets, js_command)
+
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
@@ -62,9 +66,9 @@
     cmdclass= cmdclass,
     packages=setuptools.find_packages(),
     install_requires=[
-        "jupyterlab>=3.0.0rc10,==3.*",
-        "jupyterlab-topbar>=0.6.0,<0.7.0",
-        "nbresuse>=0.4.0,<0.5.0"
+        "jupyterlab~=3.0",
+        "jupyterlab-topbar~=0.6",
+        "jupyter-resource-usage~=0.5"
     ],
     zip_safe=False,
     include_package_data=True,