drawio 16.2.4 (#87)

.binder/environment.yml

@@ -20,7 +20,7 @@ channels:
   - conda-forge
 
 dependencies:
-  - python >=3.9
+  - python >=3.7
   # demo toys
   - graphviz2drawio
   - jupyter-lsp-python-lsp-server

.github/environment.yml

@@ -45,6 +45,7 @@ dependencies:
   - flake8
   - isort >=5
   - pyflakes
+  - pyyaml
   - robotframework-lint
   # unit testing
   - pytest

.github/pip-build.txt

@@ -1,4 +1,4 @@
-# basically ipydrawio[all,test] and ipydrawio-export... plus robot
+# basically ipydrawio[all,test] and ipydrawio-export... plus robot, pyyaml
 black
 doit
 flake8
@@ -13,6 +13,7 @@ pip
 pyflakes
 pypdf2
 pytest
+pyyaml
 requests
 requests-cache
 robotframework

.github/workflows/ci.yml

@@ -239,11 +239,11 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu', 'macos', 'windows']
-        python-version: ['3.6', '3.8']
+        python-version: ['3.7', '3.10']
         include:
-          - python-version: '3.6'
+          - python-version: '3.7'
             CI_ARTIFACT: 'sdist'
-          - python-version: '3.8'
+          - python-version: '3.10'
             CI_ARTIFACT: 'wheel'
     env:
       TESTING_IN_CI: '1'

CHANGELOG.md

@@ -10,9 +10,9 @@
 
 #### @deathbeds/ipydrawio-notebook 1.2.0
 
-#### @deathbeds/ipydrawio-webpack 16.1.0
+#### @deathbeds/ipydrawio-webpack 16.2.400
 
-- updates to drawio v16.1.0
+- updates to drawio v16.2.400
 
 #### @deathbeds/ipydrawio-jupyter-templates 1.2.0
 

demo/jupyter_lite_config.json

@@ -2,7 +2,7 @@
   "LiteBuildConfig": {
     "federated_extensions": [
       "../py_packages/ipydrawio/dist/ipydrawio-1.2.0-py3-none-any.whl",
-      "https://github.com/conda-forge/releases/releases/download/noarch/bqplot-0.12.31-pyhd8ed1ab_0.tar.bz2/bqplot-0.12.31-pyhd8ed1ab_0.tar.bz2",
+      "https://github.com/conda-forge/releases/releases/download/noarch/bqplot-0.12.32-pyhd8ed1ab_0.tar.bz2/bqplot-0.12.32-pyhd8ed1ab_0.tar.bz2",
       "https://github.com/conda-forge/releases/releases/download/noarch/jupyterlab-tour-3.1.4-pyhd8ed1ab_0.tar.bz2/jupyterlab-tour-3.1.4-pyhd8ed1ab_0.tar.bz2",
       "https://github.com/conda-forge/releases/releases/download/noarch/jupyterlab_widgets-1.0.2-pyhd8ed1ab_0.tar.bz2/jupyterlab_widgets-1.0.2-pyhd8ed1ab_0.tar.bz2",
       "https://github.com/conda-forge/releases/releases/download/noarch/wxyz_datagrid-0.5.1-pyhd8ed1ab_0.tar.bz2/wxyz_datagrid-0.5.1-pyhd8ed1ab_0.tar.bz2",

dodo.py

@@ -902,12 +902,15 @@ def task_test():
             dict(
                 name="integrity",
                 file_dep=[
-                    P.SCRIPTS / "integrity.py",
-                    P.OK_LINT,
-                    P.DEMO_CONFIG,
                     *[*P.OK_SERVEREXT.values()],
-                    *[*P.PY_WHEEL.values()],
                     *[*P.PY_SDIST.values()],
+                    *[*P.PY_WHEEL.values()],
+                    *P.ALL_SETUP_CFG,
+                    P.DEMO_CONFIG,
+                    P.ENV_BINDER,
+                    P.OK_LINT,
+                    P.RECIPE,
+                    P.SCRIPTS / "integrity.py",
                 ],
                 actions=[
                     ["python", "-m", "pytest", "--pyargs", "scripts.integrity", "-vv"]

packages/ipydrawio-webpack/drawio

@@ -1 +1 @@
-Subproject commit 7964a40d76c7a02d63db5e1b7cc592047b19d8e1
+Subproject commit 07c1f206ed3c916fd970e9af20284ebad1276b6a

packages/ipydrawio-webpack/package.json

@@ -43,5 +43,5 @@
     "build:pre": "python scripts/patch.py && python scripts/static.py"
   },
   "types": "lib/index.d.ts",
-  "version": "16.1.0"
+  "version": "16.2.400"
 }

py_packages/ipydrawio-export/setup.cfg

@@ -39,15 +39,15 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Topic :: Multimedia :: Graphics :: Editors :: Vector-Based
     Topic :: Multimedia :: Graphics :: Presentation
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir =
     = src
 

py_packages/ipydrawio/setup.cfg

@@ -40,15 +40,15 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Topic :: Multimedia :: Graphics :: Editors :: Vector-Based
     Topic :: Multimedia :: Graphics :: Presentation
 
 [options]
-python_requires = >=3.6
+python_requires = >=3.7
 package_dir =
     = src
 

scripts/integrity.py

@@ -14,13 +14,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import configparser
 import json
+import re
 import sys
 import tarfile
 from pathlib import Path
 
 import jsonpointer
 import pytest
+import yaml
 
 if True:
     sys.path.append(str(Path(__file__).parent.parent))
@@ -37,6 +40,24 @@ def the_demo_config():
     return json.loads(P.DEMO_CONFIG.read_text(**P.ENC))
 
 
+@pytest.fixture
+def the_ci():
+    return yaml.safe_load(P.CI_YML.read_text(**P.ENC))
+
+
+@pytest.fixture
+def the_pythons(the_ci):
+    return sorted(
+        the_ci["jobs"]["test"]["strategy"]["matrix"]["python-version"],
+        key=lambda x: list(map(int, x.split("."))),
+    )
+
+
+@pytest.fixture
+def the_min_python(the_pythons):
+    return the_pythons[0]
+
+
 @pytest.mark.parametrize(
     "pkg,version",
     [
@@ -86,6 +107,7 @@ def test_demo_paths(the_demo_config, pointer, value):
 
 @pytest.mark.parametrize("path", P.ALL_HEADERS)
 def test_headers(path):
+    """are the license headers correct?"""
     text = path.read_text(encoding="utf-8")
     assert (
         "Copyright 2021 ipydrawio contributors" in text
@@ -97,9 +119,35 @@ def test_headers(path):
 
 @pytest.mark.parametrize("key,tarball", [*P.JS_TARBALL.items(), *P.PY_SDIST.items()])
 def test_tarball(key, tarball):
+    """do the distributons have key metadata files?"""
     with tarfile.open(str(tarball), "r") as tar:
         all_names = list(tar.getnames())
         licenses = [p for p in all_names if "LICENSE.txt" in p]
         assert licenses, f"{key} doesn't have LICENSE"
         readmes = [p for p in all_names if "README.md" in p]
         assert readmes, f"{key} doesn't have README"
+
+
+@pytest.mark.parametrize("path", [p for p in P.ALL_SETUP_CFG if p.parent != P.ROOT])
+def test_setup_cfg_pythons(path, the_pythons, the_min_python):
+    """are the python versions correctly noted?"""
+    cfg = configparser.ConfigParser()
+    cfg.read_file(path.open())
+    python_requires = cfg["options"]["python_requires"]
+    assert python_requires == f">={the_min_python}"
+    for the_py in the_pythons:
+        classifier = f"Programming Language :: Python :: {the_py}"
+        assert classifier in cfg["metadata"]["classifiers"]
+
+
+@pytest.mark.parametrize(
+    "path,py_count",
+    [
+        [P.RECIPE, 6],
+        [P.ENV_BINDER, 1],
+    ],
+)
+def test_yaml_pythons(path, py_count, the_min_python):
+    yaml_text = path.read_text(**P.ENC)
+    matches = re.findall(f"- python >={the_min_python}", yaml_text)
+    assert len(matches) == py_count, [len(matches), py_count]

scripts/project.py

@@ -165,6 +165,7 @@ DIA_URLS = {
 
 # ci
 GH = ROOT / ".github"
+CI_YML = GH / "workflows/ci.yml"
 ENV_GH = GH / "environment.yml"
 ENV_GH_CB = GH / "environment-conda-build.yml"
 ENV_GH_CB_WIN = GH / "environment-conda-build-win.yml"

yarn.lock

@@ -106,14 +106,14 @@
     "@jupyterlab/application" "^3.1.0"
 
 "@deathbeds/ipydrawio-webpack@file:packages/ipydrawio-webpack":
-  version "16.1.0"
+  version "16.2.400"
   dependencies:
     "@jupyterlab/application" "^3.1.0"
 
 "@deathbeds/ipydrawio@file:packages/ipydrawio":
   version "1.2.0"
   dependencies:
-    "@deathbeds/ipydrawio-webpack" "^16.1.0"
+    "@deathbeds/ipydrawio-webpack" "^16.2.400"
     "@jupyterlab/application" "^3.1.0"
     "@jupyterlab/launcher" "^3.1.0"
     "@jupyterlab/mainmenu" "^3.1.0"