upgrades via recent cookiecutter & npm audit fix

fhstp · Sep 9, 2023 · 6c85a49 · 6c85a49
1 parent b73b30f
commit 6c85a49
Show file tree

Hide file tree

Showing 9 changed files with 951 additions and 6,229 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,56 +8,37 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ["3.7", "3.10"]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Install node
-        uses: actions/setup-node@v1
-        with:
-          node-version: "12.x"
-      - name: Install Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: "3.7"
-          architecture: "x64"
 
-      - name: Setup pip cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pip
-          key: pip-3.7-${{ hashFiles('package.json') }}
-          restore-keys: |
-            pip-3.7-
-            pip-
-
-      - name: Get npm cache directory
-        id: npm-cache
-        run: |
-          echo "::set-output name=dir::$(npm config get cache)"
-      - uses: actions/cache@v2
-        with:
-          path: ${{ steps.npm-cache.outputs.dir }}
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
+      - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
 
       - name: Install dependencies
         run: |
-          python -m pip install -U pip setuptools codecov
+          python -m pip install -U codecov
           npm install -g codecov
       - name: Test the extension
         run: |
           python -m pip install --upgrade -v -e ".[test, examples, docs]"
-          yarn run lint:check
-
-          pytest
+          python -m pytest
           yarn run test
 
+      - name: Linting
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: |
+          yarn run lint:check
+
       - name: Check docs can be build + links
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        working-directory: docs
         run: |
           sudo apt install -y pandoc
-          # pushd docs
-          # make html
-          # python -m pytest --check-links
-          # popd
+          make html
+          python -m pytest --check-links
diff --git a/README.md b/README.md
@@ -100,6 +100,16 @@ After a change wait for the build to finish and then refresh your browser and th
 #### Python:
 If you make a change to the python code then you will need to restart the notebook kernel to have it take effect.
 
+## Updating the version
+
+To update the version, install tbump and use it to bump the version.
+By default it will also create a tag.
+
+```bash
+pip install tbump
+tbump <new-version>
+```
+
 ## Citation
 
 Kajetan Enge, Alexander Rind, Michael Iber, Robert Höldrich, and Wolfgang Aigner.

diff --git a/dev-logbook.md b/dev-logbook.md
@@ -208,8 +208,9 @@ Events
 Deploy to pypi (cp. <https://towardsdatascience.com/how-to-build-your-first-python-package-6a00b02635c9>):
 
 ```
-pip install twine
-python setup.py sdist bdist_wheel
+pip install twine hatch
+# python setup.py sdist bdist_wheel
+hatch build
 twine check dist/sonivis_lens_widget-0.1.2.dev0*
 twine upload dist/sonivis_lens_widget-0.1.2.dev0*
 ```

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -4,7 +4,7 @@ soniscope_jupyter
 
 Version: |release|
 
-A Custom Jupyter Widget Library
+jupyter notebook widget with a scatter plot and an interactive lens to enable interactive sonification
 
 
 Quickstart

diff --git a/examples/SoniScope.ipynb b/examples/SoniScope.ipynb
@@ -501,13 +501,15 @@
     "#----------------------------------------------------\n",
     "drpX = widgets.Dropdown(options=numeric_cols, value='temp °C', description='X-Axis:',)\n",
     "drpY = widgets.Dropdown(options=numeric_cols, value='hum %', description='Y-Axis:',)\n",
+    "drpC = widgets.Dropdown(options=['', 'season', 'weekday', 'weathersit'], value='', description='Color:',)\n",
     "\n",
     "#----------------------------------------------------\n",
     "# connection between frontend and python\n",
     "l = widgets.link((plotBike, 'size'), (sliderSize, 'value'))\n",
     "l2 = widgets.link((plotBike, 'shape'), (radioShape, 'value'))\n",
     "l3 = widgets.link((plotBike, 'x_field'), (drpX, 'value'))\n",
     "l4 = widgets.link((plotBike, 'y_field'), (drpY, 'value'))\n",
+    "l5 = widgets.link((plotBike, 'color_field'), (drpC, 'value'))\n",
     "\n",
     "#----------------------------------------------------\n",
     "outputBike = widgets.Output() # for using print within the def on_clicked\n",
@@ -518,6 +520,7 @@
     "                interface_text,\n",
     "                drpX, \n",
     "                drpY,\n",
+    "                drpC,\n",
     "                soni_dim, # \n",
     "                soni_sort_dim,\n",
     "                sliderSize,\n",