Refactor version management and integrity testing

Author: krassowski

README.md

@@ -76,7 +76,7 @@ Open it searching for "Show diagnostics panel" in JupyterLab commands palette or
 
 Either:
 
-- JupyterLab >=2.1,<3.0.0a0
+- JupyterLab >=2.1.0,<3.0.0a0
 
 And:
 

binder/environment.yml

@@ -7,7 +7,7 @@ channels:
 dependencies:
   # runtime dependencies
   - python >=3.7,<3.8.0a0
-  - jupyterlab >=2,<3.0.0a0
+  - jupyterlab >=2.1.0,<3.0.0a0
   - notebook >=4.3.1
   # build dependencies
   - nodejs >=10,<14

ci/job.test.yml

@@ -12,15 +12,15 @@ parameters:
   pythons:
     - name: ThreeSix
       spec: '=3.6'
-      lab: '>=2,<3.0.0a0'
+      lab: '>=2.1.0,<3.0.0a0'
       nodejs: '>=10,<11.0.0.a0'
     - name: ThreeSeven
       spec: '=3.7'
-      lab: '>=2,<3.0.0a0'
+      lab: '>=2.1.0,<3.0.0a0'
       nodejs: '>=12,<13.0.0a0'
     - name: ThreeEight
       spec: '=3.8'
-      lab: '>=2,<3.0.0a0'
+      lab: '>=2.1.0,<3.0.0a0'
       nodejs: '>=13,<14.0.0a0'
   js_cov_packages:
     - jupyterlab-go-to-definition

docs/Installation.ipynb

@@ -9,6 +9,8 @@
    "outputs": [],
    "source": [
     "from markdown import markdown\n",
+    "import sys\n",
+    "sys.path.insert(0, '..')\n",
     "from versions import (\n",
     "    JUPYTER_LSP_VERSION,\n",
     "    JUPYTERLAB_LSP_VERSION,\n",

docs/Releasing.ipynb

@@ -49,6 +49,7 @@
     "\n",
     "- `packages/jupyterlab-lsp/package.json` > `devDependencies` >\n",
     "  `@jupyterlab/application` (canonical)\n",
+    "- `binder/environment.yml`\n",
     "- `README.md`\n",
     "\n",
     "### Releasing:\n",

docs/__init__.py

@@ -1,3 +1,3 @@
 # the version of jupyterlab
 -r ./prod.txt
-jupyterlab >=2.1,<3.0.0a0
+jupyterlab >=2.1.0,<3.0.0a0

requirements/lab.txt

@@ -6,7 +6,6 @@
 
 import json
 import pathlib
-import re
 import sys
 import tempfile
 from importlib.util import find_spec
@@ -22,21 +21,21 @@
     import ruamel_yaml as yaml
 
 ROOT = pathlib.Path.cwd()
+
+sys.path.insert(0, str(ROOT))
+
+from versions import (  # noqa
+    REQUIRED_JUPYTERLAB as LAB_SPEC,
+    JUPYTER_LSP_VERSION as PY_VERSION
+)
+
 REQS = ROOT / "requirements"
 BINDER = ROOT / "binder"
 
 # docs
 MAIN_README = ROOT / "README.md"
 CHANGELOG = ROOT / "CHANGELOG.md"
 
-# dependencies
-ENV = yaml.safe_load((BINDER / "environment.yml").read_text())
-LAB_SPEC = [
-    d.split(" ", 1)[1]
-    for d in ENV["dependencies"]
-    if isinstance(d, str) and d.startswith("jupyterlab ")
-][0]
-
 # TS stuff
 NPM_NS = "@krassowski"
 PACKAGES = {
@@ -57,8 +56,7 @@
 
 # py stuff
 PY_NAME = "jupyter-lsp"
-_VERSION_PY = ROOT / "py_src" / "jupyter_lsp" / "_version.py"
-PY_VERSION = re.findall(r'= "(.*)"$', (_VERSION_PY).read_text())[0]
+
 
 # CI stuff
 PIPE_FILE = ROOT / "azure-pipelines.yml"
@@ -147,7 +145,7 @@ def test_ts_package_integrity(name, info, the_meta_package):
 
 
 @pytest.mark.parametrize(
-    "path", map(str, [REQS / "lab.txt", CI / "job.test.yml", MAIN_README])
+    "path", map(str, [REQS / "lab.txt", CI / "job.test.yml", MAIN_README, BINDER / "environment.yml"])
 )
 def test_jlab_versions(path):
     """ is the version of jupyterlab consistent?

scripts/integrity.py

@@ -1,14 +1,14 @@
 import json
-from sys import path
+from pathlib import Path
+from re import findall
 
-path.insert(0, '../py_src/jupyter_lsp')
+ROOT = Path(__file__).resolve().parent
 
-import _version   # noqa
 
+_VERSION_PY = ROOT / "py_src" / "jupyter_lsp" / "_version.py"
+JUPYTER_LSP_VERSION = findall(r'= "(.*)"$', (_VERSION_PY).read_text())[0]
 
-JUPYTER_LSP_VERSION = _version.__version__
-
-with open('../packages/jupyterlab-lsp/package.json') as f:
+with open(ROOT / "packages/jupyterlab-lsp/package.json") as f:
     jupyterlab_lsp_package = json.load(f)
 
 JUPYTERLAB_LSP_VERSION = jupyterlab_lsp_package['version']
@@ -19,4 +19,4 @@
     .lstrip('~^')
 )
 JUPYTERLAB_NEXT_MAJOR_VERSION = int(JUPYTERLAB_VERSION.split('.')[0]) + 1
-REQUIRED_JUPYTERLAB = f'>={JUPYTERLAB_VERSION},<{JUPYTERLAB_NEXT_MAJOR_VERSION}'
+REQUIRED_JUPYTERLAB = f'>={JUPYTERLAB_VERSION},<{JUPYTERLAB_NEXT_MAJOR_VERSION}.0.0a0'