Merge pull request #15 from hbcarlos/releaser

hbcarlos · web-flow · commit 0f75182a3c24 · 2023-01-11T23:54:08.000+01:00
Update check-release workflow to use latest releaser
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,13 +12,13 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Base Setup
       uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
 
     - name: Install dependencies
-      run: python -m pip install -U jupyterlab check-manifest
+      run: python -m pip install -U jupyterlab~=3.4
 
     - name: Lint the extension
       run: |
@@ -38,14 +38,13 @@ jobs:
     - name: Package the extension
       run: |
         set -eux
-        check-manifest -v
 
         pip install build
         python -m build
         pip uninstall -y "jupyterlab_lego_boost" jupyterlab
 
     - name: Upload extension packages
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: extension-artifacts
         path: dist/jupyterlab_lego_boost*
@@ -57,13 +56,13 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: Install Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: '3.9'
         architecture: 'x64'
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: extension-artifacts
     - name: Install and Test
@@ -73,8 +72,7 @@ jobs:
         sudo rm -rf $(which node)
         sudo rm -rf $(which node)
 
-        pip install jupyterlab jupyterlab_lego_boost*.whl
-
+        pip install jupyterlab~=3.4 jupyterlab_lego_boost*.whl
 
         jupyter labextension list
         jupyter labextension list 2>&1 | grep -ie "jupyterlab-lego-boost.*OK"
diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml
@@ -13,51 +13,32 @@ permissions:
 jobs:
   check_release:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        group: [check_release, link_check]
+        python-version: ["3.9"]
+        node-version: ["14.x"]
+    
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-          architecture: 'x64'
-      - name: Install node
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14.x'
-      
-      
-      - name: Get pip cache dir
-        id: pip-cache
-        run: |
-          echo "::set-output name=dir::$(pip cache dir)"
-      - name: Cache pip
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-pip-${{ hashFiles('package.json') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      - name: Cache checked links
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/pytest-link-check
-          key: ${{ runner.os }}-linkcheck-${{ hashFiles('**/.md') }}-md-links
-          restore-keys: |
-            ${{ runner.os }}-linkcheck-
-      - name: Upgrade packaging dependencies
-        run: |
-          pip install --upgrade pip setuptools wheel jupyter-packaging~=0.10 --user
+        uses: actions/checkout@v3
+      - name: Base Setup
+        uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
       - name: Install Dependencies
-        run: |
-          pip install .
+        run: pip install -e .
+
+      - name: Check Links
+        if: ${{ matrix.group == 'link_check' }}
+        uses: jupyter-server/jupyter_releaser/.github/actions/check-links@v1
+
       - name: Check Release
-        uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1
+        if: ${{ matrix.group == 'check_release' }}
+        uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-      
       - name: Upload Distributions
-        uses: actions/upload-artifact@v2
+        if: ${{ matrix.group == 'check_release' }}
+        uses: actions/upload-artifact@v3
         with:
-          name: jupyterlab_lego_boost-releaser-dist-${{ github.run_number }}
+          name: jupyter-releaser-dist-${{ github.run_number }}
           path: .jupyter_releaser_checkout/dist
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,9 @@ node_modules/
 *.tsbuildinfo
 jupyterlab_lego_boost/labextension
 
+# Version file is handled by hatchling
+jupyterlab_lego_boost/_version.py
+
 # Integration tests
 ui-tests/test-results/
 ui-tests/playwright-report/
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Link: https://www.lego.com/en-de/product/boost-creative-toolbox-17101
 To install the extension, execute:
 
 ```bash
-micromamba create -n boost -c conda-forge python nodejs yarn jupyterlab==3.4 jupyter-packaging jupyterlab-language-pack-es-ES jupyterlab-language-pack-fr-FR ipykernel xeus-python xeus-lua
+micromamba create -n boost -c conda-forge python=3.9 nodejs=16 yarn jupyterlab=3.4 jupyterlab-language-pack-es-ES jupyterlab-language-pack-fr-FR ipykernel xeus-python xeus-lua
 micromamba activate boost
 pip install jupyterlab-lego-boost
 ```
@@ -59,7 +59,7 @@ The `jlpm` command is JupyterLab's pinned version of
 `yarn` or `npm` in lieu of `jlpm` below.
 
 ```bash
-micromamba create -n boost -c conda-forge python nodejs yarn jupyterlab==3.4 jupyter-packaging jupyterlab-language-pack-es-ES jupyterlab-language-pack-fr-FR ipykernel xeus-python xeus-lua
+micromamba create -n boost -c conda-forge python=3.9 nodejs=16 yarn jupyterlab=3.4 jupyterlab-language-pack-es-ES jupyterlab-language-pack-fr-FR ipykernel xeus-python xeus-lua
 micromamba activate boost
 # Clone the repo to your local environment
 # Change directory to the jupyterlab-lego-boost directory
diff --git a/jupyterlab_lego_boost/__init__.py b/jupyterlab_lego_boost/__init__.py
@@ -1,19 +1,9 @@
-import json
-from pathlib import Path
-
 from ._version import __version__
-
-
-HERE = Path(__file__).parent.resolve()
-
-
-with (HERE / "labextension" / "package.json").open() as fid:
-    data = json.load(fid)
+from pathlib import Path
 
 
 def _jupyter_labextension_paths():
     return [{
         "src": "labextension",
-        "dest": data["name"]
+        "dest": "jupyterlab_lego_boost"
     }]
-
diff --git a/jupyterlab_lego_boost/_version.py b/jupyterlab_lego_boost/_version.py
diff --git a/package.json b/package.json
@@ -1,103 +1,92 @@
 {
-  "name": "jupyterlab-lego-boost",
-  "version": "0.1.0-alpha.1",
-  "description": "Blockly extension for JupyterLab to control the Lego Boost",
-  "keywords": [
-    "jupyter",
-    "jupyterlab",
-    "jupyterlab-extension"
-  ],
-  "homepage": "https://github.com/QuantStack/jupyterlab-lego-boost",
-  "bugs": {
-    "url": "https://github.com/QuantStack/jupyterlab-lego-boost/issues"
-  },
-  "license": "BSD-3-Clause",
-  "author": {
-    "name": "Denisa Checiu",
-    "email": ""
-  },
-  "files": [
-    "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
-    "style/**/*.{css,js,eot,gif,html,jpg,json,png,svg,woff2,ttf}"
-  ],
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "style": "style/index.css",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/QuantStack/jupyterlab-lego-boost.git"
-  },
-  "scripts": {
-    "build": "jlpm build:lib && jlpm build:labextension:dev",
-    "build:prod": "jlpm clean && jlpm build:lib && jlpm build:labextension",
-    "build:labextension": "jupyter labextension build .",
-    "build:labextension:dev": "jupyter labextension build --development True .",
-    "build:lib": "tsc",
-    "clean": "jlpm clean:lib",
-    "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
-    "clean:lintcache": "rimraf .eslintcache .stylelintcache",
-    "clean:labextension": "rimraf jupyterlab_lego_boost/labextension",
-    "clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache",
-    "eslint": "jlpm eslint:check --fix",
-    "eslint:check": "eslint . --cache --ext .ts,.tsx",
-    "install:extension": "jlpm build",
-    "lint": "jlpm stylelint && jlpm prettier && jlpm eslint",
-    "lint:check": "jlpm stylelint:check && jlpm prettier:check && jlpm eslint:check",
-    "prettier": "jlpm prettier:base --write --list-different",
-    "prettier:base": "prettier \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
-    "prettier:check": "jlpm prettier:base --check",
-    "stylelint": "jlpm stylelint:check --fix",
-    "stylelint:check": "stylelint --cache \"style/**/*.css\"",
-    "watch": "run-p watch:src watch:labextension",
-    "watch:src": "tsc -w",
-    "watch:labextension": "jupyter labextension watch .",
-    "postinstall": "patch-package"
-  },
-  "dependencies": {
-    "@jupyterlab/application": "^3.4",
-    "blockly": "^7.20211209.2",
-    "jupyterlab-blockly": "^0.2.1",
-    "patch-package": "^6.4.7",
-    "postinstall-postinstall": "^2.1.0"
-  },
-  "devDependencies": {
-    "@jupyterlab/builder": "^3.4",
-    "@typescript-eslint/eslint-plugin": "^4.8.1",
-    "@typescript-eslint/parser": "^4.8.1",
-    "eslint": "^7.14.0",
-    "eslint-config-prettier": "^6.15.0",
-    "eslint-plugin-prettier": "^3.1.4",
-    "npm-run-all": "^4.1.5",
-    "prettier": "^2.1.1",
-    "rimraf": "^3.0.2",
-    "stylelint": "^14.3.0",
-    "stylelint-config-prettier": "^9.0.3",
-    "stylelint-config-recommended": "^6.0.0",
-    "stylelint-config-standard": "~24.0.0",
-    "stylelint-prettier": "^2.0.0",
-    "typescript": "~4.5.2"
-  },
-  "sideEffects": [
-    "style/*.css",
-    "style/index.js"
-  ],
-  "styleModule": "style/index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "jupyterlab": {
-    "extension": true,
-    "outputDir": "jupyterlab_lego_boost/labextension"
-  },
-  "jupyter-releaser": {
-    "hooks": {
-      "before-build-npm": [
-        "python -m pip install jupyterlab",
-        "jlpm"
-      ],
-      "before-build-python": [
-        "jlpm clean:all"
-      ]
+    "name": "jupyterlab-lego-boost",
+    "version": "0.1.0-alpha.1",
+    "description": "Blockly extension for JupyterLab to control the Lego Boost",
+    "keywords": [
+        "jupyter",
+        "jupyterlab",
+        "jupyterlab-extension"
+    ],
+    "homepage": "https://github.com/QuantStack/jupyterlab-lego-boost",
+    "bugs": {
+        "url": "https://github.com/QuantStack/jupyterlab-lego-boost/issues"
+    },
+    "license": "BSD-3-Clause",
+    "author": {
+        "name": "Denisa Checiu",
+        "email": "me@test.com"
+    },
+    "files": [
+        "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
+        "style/**/*.{css,js,eot,gif,html,jpg,json,png,svg,woff2,ttf}"
+    ],
+    "main": "lib/index.js",
+    "types": "lib/index.d.ts",
+    "style": "style/index.css",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/QuantStack/jupyterlab-lego-boost.git"
+    },
+    "scripts": {
+        "build": "jlpm build:lib && jlpm build:labextension:dev",
+        "build:prod": "jlpm clean && jlpm build:lib && jlpm build:labextension",
+        "build:labextension": "jupyter labextension build .",
+        "build:labextension:dev": "jupyter labextension build --development True .",
+        "build:lib": "tsc",
+        "clean": "jlpm clean:lib",
+        "clean:lib": "rimraf lib tsconfig.tsbuildinfo",
+        "clean:lintcache": "rimraf .eslintcache .stylelintcache",
+        "clean:labextension": "rimraf jupyterlab_lego_boost/labextension",
+        "clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache",
+        "eslint": "jlpm eslint:check --fix",
+        "eslint:check": "eslint . --cache --ext .ts,.tsx",
+        "install:extension": "jlpm build",
+        "lint": "jlpm stylelint && jlpm prettier && jlpm eslint",
+        "lint:check": "jlpm stylelint:check && jlpm prettier:check && jlpm eslint:check",
+        "prettier": "jlpm prettier:base --write --list-different",
+        "prettier:base": "prettier \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
+        "prettier:check": "jlpm prettier:base --check",
+        "stylelint": "jlpm stylelint:check --fix",
+        "stylelint:check": "stylelint --cache \"style/**/*.css\"",
+        "watch": "run-p watch:src watch:labextension",
+        "watch:src": "tsc -w",
+        "watch:labextension": "jupyter labextension watch .",
+        "postinstall": "patch-package"
+    },
+    "dependencies": {
+        "@jupyterlab/application": "^3.4",
+        "blockly": "^7.20211209.2",
+        "jupyterlab-blockly": "^0.2.1",
+        "patch-package": "^6.4.7",
+        "postinstall-postinstall": "^2.1.0"
+    },
+    "devDependencies": {
+        "@jupyterlab/builder": "^3.4",
+        "@typescript-eslint/eslint-plugin": "^4.8.1",
+        "@typescript-eslint/parser": "^4.8.1",
+        "eslint": "^7.14.0",
+        "eslint-config-prettier": "^6.15.0",
+        "eslint-plugin-prettier": "^3.1.4",
+        "npm-run-all": "^4.1.5",
+        "prettier": "^2.1.1",
+        "rimraf": "^3.0.2",
+        "stylelint": "^14.3.0",
+        "stylelint-config-prettier": "^9.0.3",
+        "stylelint-config-recommended": "^6.0.0",
+        "stylelint-config-standard": "~24.0.0",
+        "stylelint-prettier": "^2.0.0",
+        "typescript": "~4.5.2"
+    },
+    "sideEffects": [
+        "style/*.css",
+        "style/index.js"
+    ],
+    "styleModule": "style/index.js",
+    "publishConfig": {
+        "access": "public"
+    },
+    "jupyterlab": {
+        "extension": true,
+        "outputDir": "jupyterlab_lego_boost/labextension"
     }
-  }
 }
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/setup.py b/setup.py
