diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md index 4a1c912..88eaeaf 100644 --- a/.github/ISSUE_TEMPLATE/release.md +++ b/.github/ISSUE_TEMPLATE/release.md @@ -10,7 +10,7 @@ labels: maintenance - [ ] move the new release to the top of the stack - [ ] validate on binder - [ ] validate on ReadTheDocs -- [ ] wait for a successful build of `master` +- [ ] wait for a successful build of `main` - [ ] download the `dist` archive and unpack somewhere (maybe a fresh `dist`) - [ ] create a new release through the GitHub UI - [ ] paste in the relevant CHANGELOG entries diff --git a/.github/conda.recipe/meta.yaml b/.github/conda.recipe/meta.yaml index 41f4d44..9244069 100644 --- a/.github/conda.recipe/meta.yaml +++ b/.github/conda.recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "1.3.0" %} +{% set version = "1.3.1" %} {% set build_number = 0 %} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8db5fac..2badd8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,7 +35,7 @@ env: # our stuff ATEST_RETRIES: '3' - CACHE_EPOCH: '6' + CACHE_EPOCH: '7' CONDA_BUILDERER: mambabuild jobs: diff --git a/CHANGELOG.md b/CHANGELOG.md index aa9555f..e79ec0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,27 @@ ## Unreleased -> TBD +### 1.3.1 + +#### ipydrawio-widgets 1.3.1 + +#### ipydrawio 1.3.1 + +##### @deathbeds/ipydrawio 1.3.1 + +##### @deathbeds/ipydrawio-notebook 1.3.1 + +##### @deathbeds/ipydrawio-webpack 21.1.601 + +##### @deathbeds/ipydrawio-jupyter-templates 1.3.1 + +#### ipydrawio-export 1.3.1 + +##### @deathbeds/ipydrawio-pdf 1.3.1 + +#### ipydrawio-mathjax 1.3.1 + +##### @deathbeds/ipydrawio-mathjax 1.3.1 ## Releases @@ -20,9 +40,9 @@ ##### @deathbeds/ipydrawio-notebook 1.3.0 -##### @deathbeds/ipydrawio-webpack 21.1.600 +##### @deathbeds/ipydrawio-webpack 21.1.400 -- updates to [drawio v21.1.6](https://github.com/jgraph/drawio/releases/tag/v21.1.6) +- updates to [drawio v21.1.4](https://github.com/jgraph/drawio/releases/tag/v21.1.4) - includes [mermaidjs 10.0.0](https://github.com/mermaid-js/mermaid/releases/tag/v10.0.0) diff --git a/demo/jupyter_lite_config.json b/demo/jupyter_lite_config.json index de0ff7d..afa7ce9 100644 --- a/demo/jupyter_lite_config.json +++ b/demo/jupyter_lite_config.json @@ -2,8 +2,8 @@ "LiteBuildConfig": { "cache_dir": "../build/.cache/.lite", "federated_extensions": [ - "../py_packages/ipydrawio/dist/ipydrawio-1.3.0-py3-none-any.whl", - "https://conda.anaconda.org/conda-forge/noarch/bqplot-0.12.38-pyhd8ed1ab_0.conda", + "../py_packages/ipydrawio/dist/ipydrawio-1.3.1-py3-none-any.whl", + "https://conda.anaconda.org/conda-forge/noarch/bqplot-0.12.39-pyhd8ed1ab_0.conda", "https://conda.anaconda.org/conda-forge/noarch/jupyterlab-tour-3.1.4-pyhd8ed1ab_0.tar.bz2", "https://conda.anaconda.org/conda-forge/noarch/jupyterlab-webrtc-docprovider-0.1.1-pyhd8ed1ab_0.tar.bz2", "https://conda.anaconda.org/conda-forge/noarch/jupyterlab_widgets-3.0.7-pyhd8ed1ab_0.conda", @@ -12,12 +12,12 @@ ], "ignore_sys_prefix": true, "lite_dir": ".", - "output_archive": "../build/demo/ipydrawio-lite-1.3.0.tgz", + "output_archive": "../build/demo/ipydrawio-lite-1.3.1.tgz", "output_dir": "../build/demo" }, "PipliteAddon": { "piplite_urls": [ - "../py_packages/ipydrawio-widgets/dist/ipydrawio_widgets-1.3.0-py3-none-any.whl" + "../py_packages/ipydrawio-widgets/dist/ipydrawio_widgets-1.3.1-py3-none-any.whl" ] } } diff --git a/docs/conf.py b/docs/conf.py index fd761cf..15597a9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,6 +59,7 @@ extensions = [ autosummary_generate = True autosectionlabel_prefix_document = True myst_heading_anchors = 3 +nb_execution_show_tb = True suppress_warnings = ["autosectionlabel.*"] rediraffe_redirects = { diff --git a/docs/tutorials/working-with-custom-libraries/index.ipynb b/docs/tutorials/working-with-custom-libraries/index.ipynb index b70d333..168e9ec 100644 --- a/docs/tutorials/working-with-custom-libraries/index.ipynb +++ b/docs/tutorials/working-with-custom-libraries/index.ipynb @@ -289,7 +289,9 @@ "cell_type": "code", "execution_count": null, "id": "5daa299b-08d8-4ad2-b35e-d599157612e4", - "metadata": {}, + "metadata": { + "tags": [] + }, "outputs": [], "source": [ "d.source.value = \"\"\"\n", @@ -317,7 +319,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.0" + "version": "3.11.3" } }, "nbformat": 4, diff --git a/dodo.py b/dodo.py index 4ac12e0..4a3bf42 100644 --- a/dodo.py +++ b/dodo.py @@ -763,7 +763,7 @@ def task_demo(): yield { "name": "pyodide:packages", "doc": "fetch the pyodide packages.json", - "uptodate": [doit.tools.config_changed(P.PYODIDE_URL)], + "uptodate": [config_changed(P.PYODIDE_URL)], "targets": [P.PYODIDE_PACKAGES], "actions": [P.fetch_pyodide_packages], } @@ -911,15 +911,13 @@ def task_check(): yield P._ok( { "name": "links", + "uptodate": [config_changed({"args": P.PYTEST_CHECK_LINKS_ARGS})], "file_dep": [*file_dep, P.DOCS_BUILDINFO], "actions": [ [ "pytest-check-links", "--check-anchors", - "--check-links-ignore", - "http://", - "--check-links-ignore", - "https://", + *P.PYTEST_CHECK_LINKS_ARGS, *[p for p in file_dep if p.name not in ["schema.html"]], ], ], diff --git a/packages/ipydrawio-jupyter-templates/package.json b/packages/ipydrawio-jupyter-templates/package.json index 5de18fa..5a3413f 100644 --- a/packages/ipydrawio-jupyter-templates/package.json +++ b/packages/ipydrawio-jupyter-templates/package.json @@ -1,6 +1,6 @@ { "name": "@deathbeds/ipydrawio-jupyter-templates", - "version": "1.3.0", + "version": "1.3.1", "description": "Jupyter Templates for IPyDrawio", "license": "Apache-2.0", "author": "IPyDrawio Contributors", @@ -19,7 +19,7 @@ "scripts": {}, "types": "lib/index.d.ts", "dependencies": { - "@deathbeds/ipydrawio": "^1.3.0", + "@deathbeds/ipydrawio": "^1.3.1", "@jupyterlab/application": "^3.1.0" }, "devDependencies": { diff --git a/packages/ipydrawio-mathjax/package.json b/packages/ipydrawio-mathjax/package.json index 1008369..be941a3 100644 --- a/packages/ipydrawio-mathjax/package.json +++ b/packages/ipydrawio-mathjax/package.json @@ -1,6 +1,6 @@ { "name": "@deathbeds/ipydrawio-mathjax", - "version": "1.3.0", + "version": "1.3.1", "description": "MathJax for ipydrawio", "license": "Apache-2.0", "author": "IPyDrawio Contributors", @@ -15,7 +15,7 @@ "main": "lib/index.js", "types": "lib/index.d.ts", "dependencies": { - "@deathbeds/ipydrawio-webpack": "^21.1.600", + "@deathbeds/ipydrawio-webpack": "^21.1.601", "@jupyterlab/application": "^3.1.0" }, "devDependencies": { diff --git a/packages/ipydrawio-notebook/package.json b/packages/ipydrawio-notebook/package.json index d8ae489..4da8a21 100644 --- a/packages/ipydrawio-notebook/package.json +++ b/packages/ipydrawio-notebook/package.json @@ -1,6 +1,6 @@ { "name": "@deathbeds/ipydrawio-notebook", - "version": "1.3.0", + "version": "1.3.1", "homepage": "https://ipydrawio.rtfd.io", "bugs": { "url": "https://github.com/deathbeds/ipydrawio/issues" @@ -10,7 +10,7 @@ "{lib,schema,style,src}/**/*.{ts,tsx,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,css}" ], "dependencies": { - "@deathbeds/ipydrawio": "^1.3.0", + "@deathbeds/ipydrawio": "^1.3.1", "@jupyterlab/application": "^3.1.0", "@jupyterlab/notebook": "^3.1.0" }, diff --git a/packages/ipydrawio-pdf/package.json b/packages/ipydrawio-pdf/package.json index cafc345..faadefb 100644 --- a/packages/ipydrawio-pdf/package.json +++ b/packages/ipydrawio-pdf/package.json @@ -1,6 +1,6 @@ { "name": "@deathbeds/ipydrawio-pdf", - "version": "1.3.0", + "version": "1.3.1", "homepage": "https://ipydrawio.rtfd.io", "bugs": { "url": "https://github.com/deathbeds/ipydrawio/issues" @@ -13,7 +13,7 @@ "@jupyterlab/application": "^3.1.0" }, "devDependencies": { - "@deathbeds/ipydrawio": "^1.3.0", + "@deathbeds/ipydrawio": "^1.3.1", "@jupyterlab/builder": "^3.6.1" }, "jupyterlab": { diff --git a/packages/ipydrawio-webpack/package.json b/packages/ipydrawio-webpack/package.json index 3b38dbd..f631268 100644 --- a/packages/ipydrawio-webpack/package.json +++ b/packages/ipydrawio-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@deathbeds/ipydrawio-webpack", - "version": "21.1.600", + "version": "21.1.601", "description": "A webpack-ready repackaging of drawio", "license": "Apache-2.0", "author": "IPyDrawio Contributors", diff --git a/packages/ipydrawio/package.json b/packages/ipydrawio/package.json index cf8bb83..ab1d2b1 100644 --- a/packages/ipydrawio/package.json +++ b/packages/ipydrawio/package.json @@ -1,6 +1,6 @@ { "name": "@deathbeds/ipydrawio", - "version": "1.3.0", + "version": "1.3.1", "description": "A JupyterLab extension for embedding interactive drawio / mxgraph diagrams.", "license": "Apache-2.0", "author": "IPyDrawio Contributors", @@ -21,7 +21,7 @@ }, "types": "lib/index.d.ts", "dependencies": { - "@deathbeds/ipydrawio-webpack": "^21.1.600", + "@deathbeds/ipydrawio-webpack": "^21.1.601", "@jupyterlab/application": "^3.1.0", "@jupyterlab/launcher": "^3.1.0", "@jupyterlab/mainmenu": "^3.1.0" diff --git a/py_packages/ipydrawio-export/setup.cfg b/py_packages/ipydrawio-export/setup.cfg index 91cc014..5bf949b 100644 --- a/py_packages/ipydrawio-export/setup.cfg +++ b/py_packages/ipydrawio-export/setup.cfg @@ -56,7 +56,7 @@ include_package_data = True zip_safe = False install_requires = - ipydrawio ==1.3.0 + ipydrawio ==1.3.1 lxml pillow pypdf diff --git a/py_packages/ipydrawio-mathjax/setup.cfg b/py_packages/ipydrawio-mathjax/setup.cfg index a51185d..4039436 100644 --- a/py_packages/ipydrawio-mathjax/setup.cfg +++ b/py_packages/ipydrawio-mathjax/setup.cfg @@ -56,7 +56,7 @@ include_package_data = True zip_safe = False install_requires = - ipydrawio ==1.3.0 + ipydrawio ==1.3.1 [options.packages.find] where = diff --git a/py_packages/ipydrawio/setup.cfg b/py_packages/ipydrawio/setup.cfg index b66ca3e..d95442b 100644 --- a/py_packages/ipydrawio/setup.cfg +++ b/py_packages/ipydrawio/setup.cfg @@ -58,7 +58,7 @@ zip_safe = False install_requires = jupyterlab ==3.* - ipydrawio-widgets ==1.3.0 + ipydrawio-widgets ==1.3.1 [options.extras_require] clean = diff --git a/scripts/project.py b/scripts/project.py index c0be0da..1cd4a49 100644 --- a/scripts/project.py +++ b/scripts/project.py @@ -115,6 +115,17 @@ ATEST_ARGS = json.loads(os.environ.get("ATEST_ARGS", "[]")) ATEST_ATTEMPT = json.loads(os.environ.get("ATEST_ATTEMPT", "0")) ATEST_RETRIES = int(os.environ.get("ATEST_RETRIES") or "0") PYTEST_ARGS = json.loads(os.environ.get("PYTEST_ARGS", "[]")) +PYTEST_CHECK_LINKS_ARGS = json.loads( + os.environ.get( + "PYTEST_CHECK_LINKS_ARGS", + """[ + "--check-links-ignore", + "http://", + "--check-links-ignore", + "https://" +]""", + ), +) ATEST_PROCS = int(os.environ.get("ATEST_PROCS", "4")) # find root @@ -411,8 +422,8 @@ BUILD_WHEELS = BUILD / "wheels" DEMO_WHEELS = DEMO / "pypi" NOARCH_WHL = "py3-none-any.whl" IGNORED_WHEELS = ["widgetsnbextension", "nbformat", "ipykernel", "pyolite"] -# sync swith jupyterlite -PYODIDE_URL = "https://cdn.jsdelivr.net/pyodide/v0.21.1/full" +# sync with jupyterlite-pyodide-kernel +PYODIDE_URL = "https://cdn.jsdelivr.net/pyodide/v0.23.0/full" PYODIDE_PACKAGES = BUILD / "pyodide-packages.json" # docs diff --git a/yarn.lock b/yarn.lock index 622e486..ff83e1d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -81,32 +81,32 @@ tslib "~2.3.1" "@deathbeds/ipydrawio-jupyter-templates@file:packages/ipydrawio-jupyter-templates": - version "1.3.0" + version "1.3.1" dependencies: - "@deathbeds/ipydrawio" "^1.3.0" + "@deathbeds/ipydrawio" "^1.3.1" "@jupyterlab/application" "^3.1.0" "@deathbeds/ipydrawio-notebook@file:packages/ipydrawio-notebook": - version "1.3.0" + version "1.3.1" dependencies: - "@deathbeds/ipydrawio" "^1.3.0" + "@deathbeds/ipydrawio" "^1.3.1" "@jupyterlab/application" "^3.1.0" "@jupyterlab/notebook" "^3.1.0" "@deathbeds/ipydrawio-pdf@file:packages/ipydrawio-pdf": - version "1.3.0" + version "1.3.1" dependencies: "@jupyterlab/application" "^3.1.0" "@deathbeds/ipydrawio-webpack@file:packages/ipydrawio-webpack": - version "21.1.600" + version "21.1.601" dependencies: "@jupyterlab/application" "^3.1.0" "@deathbeds/ipydrawio@file:packages/ipydrawio": - version "1.3.0" + version "1.3.1" dependencies: - "@deathbeds/ipydrawio-webpack" "^21.1.600" + "@deathbeds/ipydrawio-webpack" "^21.1.601" "@jupyterlab/application" "^3.1.0" "@jupyterlab/launcher" "^3.1.0" "@jupyterlab/mainmenu" "^3.1.0"