Merge pull request #299

ci: improve ci

.github/workflows/test.yml

@@ -1,9 +1,11 @@
 name: Build
 
 on:
-  - push
-  - pull_request
-  - workflow_dispatch
+  push:
+    branches:
+      - master
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   lint:
@@ -26,15 +28,13 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
-
       - name: install build
         run: python -m pip install build
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install "reacton[generate]" ipyvue
-
       - name: build wheel
         run: python -m build
 
@@ -44,6 +44,8 @@ jobs:
           python -m ipyvuetify.components
           diff ipyvuetify/components.py ipyvuetify/components-previous.py
 
+      - name: Package js
+        run: (cd js && npm pack)
       - name: Upload build artifacts
         uses: actions/upload-artifact@v3
         with:
@@ -103,9 +105,48 @@ jobs:
           name: ipyvuetify-test-results
           path: test-results
 
+  release-dry-run:
+    needs: [test, ui-test]
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: ipyvuetify-dist-${{ github.run_number }}
+
+      - name: Install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: "14.x"
+          registry-url: "https://registry.npmjs.org"
+
+      - name: Install Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install twine
+
+      - name: Publish the Python package
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
+        run: twine upload --skip-existing --repository testpypi dist/*
+
+      - name: Publish the NPM package
+        run: |
+          cd js
+          echo $PRE_RELEASE
+          if [[ $PRE_RELEASE == "true" ]]; then export TAG="next"; else export TAG="latest"; fi
+          npm publish --dry-run  --tag ${TAG}  --access public *.tgz
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          PRE_RELEASE: ${{ github.event.release.prerelease }}
+
   release:
     if: startsWith(github.event.ref, 'refs/tags/v')
-    needs: [test]
+    needs: [release-dry-run]
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/download-artifact@v3
@@ -126,7 +167,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install twine wheel jupyter-packaging jupyterlab
+          pip install twine
 
       - name: Publish the Python package
         env:
@@ -136,6 +177,7 @@ jobs:
 
       - name: Publish the NPM package
         run: |
+          cd js
           echo $PRE_RELEASE
           if [[ $PRE_RELEASE == "true" ]]; then export TAG="next"; else export TAG="latest"; fi
           npm publish --tag ${TAG} --access public *.tgz

.gitignore

@@ -16,8 +16,7 @@ ipyvuetify/generated
 js/src/generated
 
 # Compiled javascript
-ipyvuetify/labextension/
-ipyvuetify/nbextension/
+prefix/share
 js/lib
 
 # Unit test / coverage reports

MANIFEST.in

@@ -1,7 +1,4 @@
 include LICENSE
-recursive-include ipyvuetify/nbextension *.*
-recursive-include ipyvuetify/labextension *.*
-include jupyter-vuetify.json
+recursive-include prefix *.*
 recursive-include ipyvuetify/extra *.vue
-recursive-include generate_source/ *.*
-recursive-include js/ *.*
+recursive-include ipyvuetify/generated *.*

generate_source/generate_source.py

@@ -34,7 +34,7 @@ def generate():
 
     generate_schema(vuetify_api, base_schema, widget_gen_schema)
 
-    NPMPackage(here / "package.json").install()
+    NPMPackage(here / "package.json")._run_npm("ci")
 
     reset_dir(destination_js)
 

ipyvuetify/__init__.py

@@ -5,10 +5,22 @@
 from .VuetifyTemplate import VuetifyTemplate
 
 
+def _prefix():
+    import sys
+    from pathlib import Path
+
+    prefix = sys.prefix
+    here = Path(__file__).parent
+    # for when in dev mode
+    if (here.parent / "prefix").exists():
+        prefix = str(here.parent)
+    return prefix
+
+
 def _jupyter_labextension_paths():
     return [
         {
-            "src": "labextension",
+            "src": f"{_prefix()}/prefix/share/jupyter/labextensions/jupyter-vuetify/",
             "dest": "jupyter-vuetify",
         }
     ]
@@ -18,7 +30,7 @@ def _jupyter_nbextension_paths():
     return [
         {
             "section": "notebook",
-            "src": "nbextension",
+            "src": f"{_prefix()}/prefix/share/jupyter/nbextensions/jupyter-vuetify/",
             "dest": "jupyter-vuetify",
             "require": "jupyter-vuetify/extension",
         }

js/package.json

@@ -32,7 +32,7 @@
     "watch:webpack": "webpack --mode development --watch",
     "watch": "run-p watch:*",
     "clean": "rimraf lib/ dist/",
-    "prepare": "run-s build:*",
+    "build": "run-s build:*",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "devDependencies": {
@@ -66,7 +66,7 @@
   },
   "jupyterlab": {
     "extension": "lib/labplugin",
-    "outputDir": "../ipyvuetify/labextension",
+    "outputDir": "../prefix/share/jupyter/labextensions/jupyter-vuetify",
     "webpackConfig": "webpack.config.lab3.js",
     "sharedPackages": {
       "@jupyter-widgets/base": {

js/webpack.config.js

@@ -24,7 +24,15 @@ module.exports = [
     entry: "./lib/extension.js",
     output: {
       filename: "extension.js",
-      path: path.resolve(__dirname, "..", "ipyvuetify", "nbextension"),
+      path: path.resolve(
+        __dirname,
+        "..",
+        "prefix",
+        "share",
+        "jupyter",
+        "nbextensions",
+        "jupyter-vuetify"
+      ),
       libraryTarget: "amd",
     },
     mode: "production",
@@ -39,7 +47,15 @@ module.exports = [
     entry: "./lib/notebook.js",
     output: {
       filename: "index.js",
-      path: path.resolve(__dirname, "..", "ipyvuetify", "nbextension"),
+      path: path.resolve(
+        __dirname,
+        "..",
+        "prefix",
+        "share",
+        "jupyter",
+        "nbextensions",
+        "jupyter-vuetify"
+      ),
       libraryTarget: "amd",
     },
     devtool: "source-map",
@@ -62,7 +78,15 @@ module.exports = [
     entry: "./lib/nodeps.js",
     output: {
       filename: "nodeps.js",
-      path: path.resolve(__dirname, "..", "ipyvuetify", "nbextension"),
+      path: path.resolve(
+        __dirname,
+        "..",
+        "prefix",
+        "share",
+        "jupyter",
+        "nbextensions",
+        "jupyter-vuetify"
+      ),
       libraryTarget: "amd",
     },
     devtool: "source-map",

setup.py

@@ -8,8 +8,6 @@
 ROOT = Path(__file__).parent
 sys.path.append(str(ROOT))
 
-from generate_source import generate_source  # noqa
-
 
 def update_package_data(distribution) -> None:
     """Update package_data to catch changes during setup"""
@@ -31,8 +29,14 @@ class DecoratedCommand(command):
 
         def run(self):
             """Run the command"""
-            NPMPackage(ROOT / "js" / "package.json").install()
-            generate_source.generate()
+            if sys.argv[1] == "sdist" or sys.argv[1] == "dist_info":
+                from generate_source import generate_source
+
+                npm = NPMPackage(ROOT / "js" / "package.json")
+                npm._run_npm("ci")
+                generate_source.generate()
+                npm.run_script("build")
+
             self.distribution.data_files = get_data_files()
             command.run(self)
 
@@ -41,11 +45,14 @@ def run(self):
 
 def get_data_files():
     """files that need to be installed in specific locations upon installation."""
-
-    nbext = [rel(f) for f in ROOT.glob("ipyvuetify/nbextension/*")]
-    package = [rel(f) for f in ROOT.glob("ipyvuetify/labextension/package.json")]
-    labext = [rel(f) for f in ROOT.glob("ipyvuetify/labextension/static/*")]
-    nbconfig = [rel(f) for f in ROOT.glob("jupyter-vuetify.json")]
+    nbext = [rel(f) for f in ROOT.glob("prefix/share/jupyter/nbextensions/jupyter-vuetify/*")]
+    package = [
+        rel(f) for f in ROOT.glob("prefix/share/jupyter/labextensions/jupyter-vuetify/package.json")
+    ]
+    labext = [
+        rel(f) for f in ROOT.glob("prefix/share/jupyter/labextensions/jupyter-vuetify/static/*")
+    ]
+    nbconfig = [rel(f) for f in ROOT.glob("prefix/etc/nbconfig/notebook.d/jupyter-vuetify.json")]
 
     return [
         ("share/jupyter/nbextensions/jupyter-vuetify", nbext),