Merge branch 'RoboStack:master' into master

Author: ldania

.github/workflows/build.yml

@@ -22,8 +22,12 @@ jobs:
     - name: Build the extension
       run: |
         set -eux
-        jlpm
-        jlpm run eslint:check
+        # TODO: add lint check
+        #pushd js
+        #jlpm
+        #jlpm run eslint:check
+        #popd
+        
         python -m pip install .
         jupyter labextension list
         jupyter labextension list 2>&1 | grep -ie "@robostack/jupyter-ros.*OK"

.github/workflows/check-release.yml

@@ -0,0 +1,63 @@
+name: Check Release
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+permissions:
+  contents: write
+
+jobs:
+  check_release:
+    runs-on: ubuntu-latest
+    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
+      - name: Install Dependencies
+        run: |
+          pip install .
+      - name: Check Release
+        uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Upload Distributions
+        uses: actions/upload-artifact@v2
+        with:
+          name: jupyros-releaser-dist-${{ github.run_number }}
+          path: .jupyter_releaser_checkout/dist

CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+
+<!-- <START NEW CHANGELOG ENTRY> -->
+
+## 0.5.0
+
+<!-- <END NEW CHANGELOG ENTRY> -->

MANIFEST.in

@@ -1,9 +1,28 @@
 include LICENSE
-include README.md
+include *.md
 include pyproject.toml
 
-include jupyros/jupyros.json
+graft jupyros/ros1
+graft jupyros/ros2
+include jupyros/_version.py
+include jupyros/__init__.py
+
+# Extensions
+graft jupyros/nbextension
+graft jupyros/labextension
+include install.json
+include jupyros/jupyter-ros.json
 include jupyros/jupyros_server_extension.json
 
-graft jupyros/static
-graft jupyros/labextension
+# Javascript files
+include js/package.json
+include js/webpack.config.js
+
+prune **/node_modules
+
+# Patterns to exclude from any directory
+global-exclude *~
+global-exclude *.pyc
+global-exclude *.pyo
+global-exclude .git
+global-exclude .ipynb_checkpoints

js/package.json

@@ -2,7 +2,12 @@
   "name": "@robostack/jupyter-ros",
   "version": "0.5.0",
   "description": "Jupyter widgets for the ROS ecosystem.",
-  "author": "Wolf Vollprecht",
+  "homepage": "https://github.com/wolfv/jupyter-ros.git",
+  "author": {
+    "name": "Wolf Vollprecht",
+    "email": "[email protected]"
+  },
+  "license": "BSD-3-Clause",
   "main": "lib/labplugin.js",
   "repository": {
     "type": "git",
@@ -21,8 +26,12 @@
   ],
   "scripts": {
     "clean": "rimraf dist/ ../jupyros/nbextension ../jupyros/labextension",
-    "build": "jlpm run clean && webpack",
-    "build:labextension": "jlpm run build && jupyter labextension build .",
+    "build": "jlpm run build:lib && jlpm run build:labextension:dev",
+    "build:lib": "webpack",
+    "build:prod": "jlpm run clean && jlpm run build:lib && jlpm run build:labextension",
+    "build:labextension": "jupyter labextension build .",
+    "build:labextension:dev": "jupyter labextension build --development True .",
+    "install:extension": "jlpm run build",
     "watch": "run-p watch:src && watch:labextension",
     "watch:src": "webpack --watch",
     "watch:labextension": "jupyter labextension watch .",

jupyros/__init__.py

@@ -6,7 +6,7 @@
 # The full license is in the file LICENSE, distributed with this software.  #
 #############################################################################
 
-from ._version import version_info, __version__
+from ._version import __version__
 import os
 
 try:

jupyros/_version.py

@@ -6,9 +6,38 @@
 # The full license is in the file LICENSE, distributed with this software.  #
 #############################################################################
 
-version_info = (0, 5, 0, 'final', 0)
+import json
+from pathlib import Path
 
-_specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}
+__all__ = ["__version__"]
 
-__version__ = '%s.%s.%s%s'%(version_info[0], version_info[1], version_info[2],
-  '' if version_info[3]=='final' else _specifier_[version_info[3]]+str(version_info[4]))
+def _fetchVersion():
+    HERE = Path(__file__).parent.parent.resolve()
+
+    for settings in HERE.rglob("package.json"):
+        try:
+            with settings.open() as f:
+                version = json.load(f)["version"]
+                return (
+                    version.replace("-alpha.", "a")
+                    .replace("-beta.", "b")
+                    .replace("-rc.", "rc")
+                )
+        except FileNotFoundError:
+            pass
+
+    raise FileNotFoundError(f"Could not find package.json under dir {HERE!s}")
+
+def _fetchJSVersion():
+    HERE = Path(__file__).parent.parent.resolve()
+
+    for settings in HERE.rglob("package.json"):
+        try:
+            with settings.open() as f:
+                return json.load(f)["version"]
+        except FileNotFoundError:
+            pass
+
+    raise FileNotFoundError(f"Could not find package.json under dir {HERE!s}")
+
+__version__ = _fetchVersion()

jupyros/ros1/ros3d.py

@@ -11,9 +11,9 @@
 from traitlets import *
 import ipywidgets as widgets
 
-from .._version import version_info
+from .._version import _fetchJSVersion
 
-js_version = '^' + '.'.join([str(x) for x in version_info[:3]])
+js_version = '^' + _fetchJSVersion()
 
 
 def _quick_widget(package_name, version, has_view=True):

pyproject.toml

@@ -1,3 +1,27 @@
 [build-system]
-requires = ["jupyter_packaging~=0.7.9", "jupyterlab>=3.0.0,==3.*", "setuptools>=40.8.0", "wheel"]
-build-backend = "setuptools.build_meta"
+requires = ["jupyter_packaging~=0.10,<2", "jupyterlab>=3,<4"]
+build-backend = "jupyter_packaging.build_api"
+
+[tool.jupyter-packaging.options]
+skip-if-exists = ["jupyros/labextension/static/style.js", "jupyros/nbextension/extension.js", "jupyros/nbextension/index.js"]
+ensured-targets = ["jupyros/labextension/static/style.js", "jupyros/labextension/package.json", "jupyros/nbextension/extension.js", "jupyros/nbextension/index.js"]
+
+[tool.jupyter-packaging.builder]
+factory = "jupyter_packaging.npm_builder"
+
+[tool.jupyter-packaging.build-args]
+path="js"
+build_cmd = "build:prod"
+source_dir="lib"
+npm = ["jlpm"]
+
+[tool.check-manifest]
+ignore = ["jupyros/labextension/**", "jupyros/nbextension/**", "notebooks/**", "scripts/**", "docs/**", "js/**", ".*"]
+
+[tool.jupyter-releaser.hooks]
+before-bump-version = ["python -m pip install jupyterlab", "cd js && jlpm clean"]
+before-build-npm = ["python -m pip install jupyterlab", "cd js && jlpm clean && jlpm"]
+before-build-python = ["cd js && jlpm clean"]
+
+[tool.jupyter-releaser.options]
+version-cmd = "python scripts/bump-version.py"

scripts/bump-version.py

@@ -0,0 +1,79 @@
+#############################################################################
+# Copyright (c) 2018, QuantStack                                            #
+#                                                                           #
+# Distributed under the terms of the BSD 3-Clause License.                  #
+#                                                                           #
+# The full license is in the file LICENSE, distributed with this software.  #
+#############################################################################
+
+import json
+import click
+from pathlib import Path
+from jupyter_releaser.util import get_version, run
+from pkg_resources import parse_version
+
+def _update_version(version):
+    HERE = Path(__file__).parent.parent.resolve()
+
+    for settings in HERE.rglob("package.json"):
+        try:
+            with settings.open('r') as f:
+                pckg_json = json.load(f)
+            
+            pckg_json['version'] = version
+
+            with settings.open('w') as f:
+                json.dump(pckg_json, f, indent=2)
+            
+            # Check version
+            with settings.open('r') as f:
+                ver = json.load(f)['version']
+                print("package.json version:", ver)
+            
+            return
+                
+        except FileNotFoundError:
+            pass
+
+    raise FileNotFoundError(f"Could not find package.json under dir {HERE!s}")
+
+@click.command()
+@click.argument("spec", nargs=1)
+def bump(spec):
+    status = run("git status --porcelain").strip()
+    if len(status) > 0:
+        raise Exception("Must be in a clean git state with no untracked files")
+
+    curr = parse_version(get_version())
+
+    if spec == 'next':
+        spec = f"{curr.major}.{curr.minor}."
+        if curr.pre:
+            p, x = curr.pre
+            spec += f"{curr.micro}{p}{x + 1}"
+        else:
+            spec += f"{curr.micro + 1}"
+    
+    elif spec == 'patch':
+        spec = f"{curr.major}.{curr.minor}."
+        if curr.pre:
+            spec += f"{curr.micro}"
+        else:
+            spec += f"{curr.micro + 1}"
+
+
+    version = parse_version(spec)
+
+    # convert the Python version
+    js_version = f"{version.major}.{version.minor}.{version.micro}"
+    if version.pre:
+        p, x = version.pre
+        p = p.replace("a", "alpha").replace("b", "beta")
+        js_version += f"-{p}.{x}"
+
+    # bump the JS packages
+    _update_version(js_version)
+
+
+if __name__ == "__main__":
+    bump()