Review

Author: hbcarlos

.eslintignore

@@ -3,7 +3,6 @@
 **/style
 **/package.json
 **/tsconfig.json
-**/patches
 **/*.d.ts
 
 .github
@@ -12,6 +11,8 @@ jupyterlab_blockly
 docs
 examples
 node_modules
+patches
+scripts
 .eslintignore
 .eslintrc.js
 .gitignore

.prettierignore

@@ -4,6 +4,7 @@
 **/package.json
 **/tsconfig.json
 **/patches
+**/scripts
 **/*.d.ts
 
 .github
@@ -12,6 +13,8 @@ jupyterlab_blockly
 docs
 examples
 node_modules
+patches
+scripts
 .eslintignore
 .eslintrc.js
 .gitignore

MANIFEST.in

@@ -11,11 +11,11 @@ graft jupyterlab_blockly/labextension
 recursive-include patches *.patch
 
 # Javascript files
-graft src
-graft style
+graft packages/blockly-extension
 prune **/node_modules
 prune lib
 prune binder
+prune scripts
 
 # Patterns to exclude from any directory
 global-exclude *~

jupyterlab_blockly/_version.py

@@ -6,7 +6,7 @@
 def _fetchVersion():
     HERE = Path(__file__).parent.resolve()
 
-    for settings in HERE.rglob("package.json"): 
+    for settings in HERE.rglob("packages/blockly-extension/package.json"): 
         try:
             with settings.open() as f:
                 version = json.load(f)["version"]

package.json

@@ -1,26 +1,7 @@
 {
-  "name": "jupyterlab-blockly",
+  "name": "jupyterlab-blockly-root",
+  "version": "0.1.0",
   "private": true,
-  "version": "0.1.0-alpha.2",
-  "description": "Blockly extension for JupyterLab.",
-  "keywords": [
-    "jupyter",
-    "jupyterlab",
-    "jupyterlab-extension"
-  ],
-  "homepage": "https://github.com/quantstack/jupyterlab-blockly",
-  "bugs": {
-    "url": "https://github.com/quantstack/jupyterlab-blockly/issues"
-  },
-  "license": "BSD-3-Clause",
-  "author": {
-    "name": "quantstack",
-    "email": ""
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/quantstack/jupyterlab-blockly.git"
-  },
   "workspaces": {
     "packages": [
       "packages/*"

packages/blockly-extension/package.json

@@ -71,13 +71,5 @@
   "jupyterlab": {
     "extension": true,
     "outputDir": "../../jupyterlab_blockly/labextension"
-  },
-  "jupyter-releaser": {
-    "hooks": {
-      "before-build-npm": [
-        "python -m pip install jupyterlab",
-        "jlpm"
-      ]
-    }
   }
 }

packages/blockly/package.json

@@ -65,13 +65,5 @@
   "styleModule": "style/index.js",
   "publishConfig": {
     "access": "public"
-  },
-  "jupyter-releaser": {
-    "hooks": {
-      "before-build-npm": [
-        "python -m pip install jupyterlab",
-        "jlpm"
-      ]
-    }
   }
 }

pyproject.toml

@@ -15,3 +15,10 @@ npm = ["jlpm"]
 
 [tool.check-manifest]
 ignore = ["jupyterlab_blockly/labextension/**", "packages/**", "lerna.json", "yarn.lock", ".*", "package-lock.json"]
+
+[tool.jupyter-releaser.hooks]
+before-bump-version = ["python -m pip install jupyterlab~=3.4"]
+before-build-npm = ["python -m pip install jupyterlab", "jlpm"]
+
+[tool.jupyter-releaser.options]
+version-cmd = "python scripts/bump-version.py --force"

scripts/bump-version.py

@@ -0,0 +1,59 @@
+#############################################################################
+# Copyright (c) 2018, Voila Contributors                                    #
+# 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 click
+from jupyter_releaser.util import get_version, run
+from pkg_resources import parse_version
+
+LERNA_CMD = "jlpm run lerna version --no-push --force-publish --no-git-tag-version"
+
+
+@click.command()
+@click.option("--force", default=False, is_flag=True)
+@click.argument("spec", nargs=1)
+def bump(force, 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
+    lerna_cmd = f"{LERNA_CMD} {js_version}"
+    if force:
+        lerna_cmd += " --yes"
+    run(lerna_cmd)
+
+
+if __name__ == "__main__":
+    bump()

setup.py

@@ -30,7 +30,7 @@
 long_description = (HERE / "README.md").read_text()
 
 # Get the package info from package.json
-pkg_json = json.loads((HERE / "package.json").read_bytes())
+pkg_json = json.loads((HERE / "packages/blockly-extension/package.json").read_bytes())
 version = (
     pkg_json["version"]
     .replace("-alpha.", "a")
@@ -51,6 +51,9 @@
     long_description_content_type="text/markdown",
     packages=setuptools.find_packages(),
     install_requires=[],
+    extras_require={
+        'dev': ['click','jupyter_releaser==0.22']
+    },
     zip_safe=False,
     include_package_data=True,
     python_requires=">=3.7",