From 59b27508dc445413caa63b253e753ff13bf8df85 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Tue, 11 Apr 2023 16:48:58 -0500 Subject: [PATCH] Update to drawio 21.1.6, use main branch (#115) --- .../conda.recipe}/meta.yaml | 2 +- .github/pull_request_template.md | 2 +- .github/workflows/ci.yml | 4 +- CHANGELOG.md | 4 +- CONTRIBUTING.md | 6 +- README.md | 32 ++++----- ROADMAP.md | 40 ----------- demo/jupyter_lite_config.json | 4 +- docs/ROADMAP.ipynb | 68 ++++++++++++------- docs/about/index.md | 2 + docs/conf.py | 2 +- .../designing-jupyter-extensions/index.ipynb | 28 +++++--- .../ipydrawio-jupyter-templates/README.md | 2 +- packages/ipydrawio-mathjax/README.md | 2 +- packages/ipydrawio-mathjax/package.json | 2 +- packages/ipydrawio-notebook/README.md | 2 +- packages/ipydrawio-pdf/README.md | 2 +- packages/ipydrawio-webpack/README.md | 2 +- packages/ipydrawio-webpack/drawio | 2 +- packages/ipydrawio-webpack/package.json | 2 +- packages/ipydrawio/README.md | 2 +- packages/ipydrawio/package.json | 2 +- py_packages/ipydrawio-export/README.md | 8 +-- py_packages/ipydrawio-export/setup.cfg | 2 +- py_packages/ipydrawio-mathjax/README.md | 8 +-- py_packages/ipydrawio-mathjax/setup.cfg | 2 +- py_packages/ipydrawio-widgets/README.md | 10 +-- py_packages/ipydrawio-widgets/setup.cfg | 2 +- py_packages/ipydrawio/README.md | 32 ++++----- py_packages/ipydrawio/setup.cfg | 2 +- scripts/project.py | 2 +- yarn.lock | 4 +- 32 files changed, 137 insertions(+), 149 deletions(-) rename {conda.recipe => .github/conda.recipe}/meta.yaml (99%) delete mode 100644 ROADMAP.md diff --git a/conda.recipe/meta.yaml b/.github/conda.recipe/meta.yaml similarity index 99% rename from conda.recipe/meta.yaml rename to .github/conda.recipe/meta.yaml index 3fba0e0..41f4d44 100644 --- a/conda.recipe/meta.yaml +++ b/.github/conda.recipe/meta.yaml @@ -2,7 +2,7 @@ {% set build_number = 0 %} -{% set url_base = RECIPE_DIR.replace("\\", "/") + "/../dist" %} +{% set url_base = RECIPE_DIR.replace("\\", "/") + "/../../dist" %} {% if not url_base.startswith("/") %} {% set url_base = "/" + url_base %} {% endif %} diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index f9aee4d..bd256b9 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,7 +2,7 @@ Thanks for contributing to ipydrawio! Please fill out the following items to submit a pull request. See the contributing guidelines for more information: -https://github.com/deathbeds/ipydrawio/blob/master/CONTRIBUTING.md +https://github.com/deathbeds/ipydrawio/blob/main/CONTRIBUTING.md --> ## References diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d33f59..8db5fac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,10 +17,10 @@ on: push: branches: - - master + - main pull_request: branches: - - master + - '*' concurrency: group: ${{ github.ref }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 1748547..aa9555f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,9 +20,9 @@ ##### @deathbeds/ipydrawio-notebook 1.3.0 -##### @deathbeds/ipydrawio-webpack 21.1.400 +##### @deathbeds/ipydrawio-webpack 21.1.600 -- updates to [drawio v21.1.4](https://github.com/jgraph/drawio/releases/tag/v21.1.4) +- updates to [drawio v21.1.6](https://github.com/jgraph/drawio/releases/tag/v21.1.6) - includes [mermaidjs 10.0.0](https://github.com/mermaid-js/mermaid/releases/tag/v10.0.0) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e2d6576..25c5d2b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,9 +8,9 @@ - improving the binder demo - improving [continuous integration][ci] and [developer experience][dodo] -[roadmap]: https://github.com/deathbeds/ipydrawio/blob/master/ROADMAP.md -[ci]: https://github.com/deathbeds/ipydrawio/blob/master/.github/workflows/ci.yml -[dodo]: https://github.com/deathbeds/ipydrawio/blob/master/dodo.py +[roadmap]: https://github.com/deathbeds/ipydrawio/blob/main/docs/ROADMAP.ipynb +[ci]: https://github.com/deathbeds/ipydrawio/blob/main/.github/workflows/ci.yml +[dodo]: https://github.com/deathbeds/ipydrawio/blob/main/dodo.py ## Prerequisites diff --git a/README.md b/README.md index 09a1a89..fa9476d 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ pip install ipydrawio[all] - or follow the [Installation instructions](#installation) and **Start JupyterLab** - Open a diagram, by doing one of: - Creating a - + Diagram\_ from the [Launcher][] - Uploading a diagram created on [diagrams.net](https://diagrams.net) with the _[File Manager][]_ and double clicking it @@ -191,22 +191,22 @@ See the License for the specific language governing permissions and limitations under the License. ``` -[apache 2.0]: https://github.com/deathbeds/ipydrawio/blob/master/LICENSE.txt +[apache 2.0]: https://github.com/deathbeds/ipydrawio/blob/main/LICENSE.txt [@jgraph/drawio]: https://github.com/jgraph/drawio [@jgraph/draw-image-export2]: https://github.com/jgraph/draw-image-export2 [jupyterlab]: https://github.com/jupyterlab/jupyterlab [drawio]: https://www.diagrams.net [quantstack/jupyterlab-drawio]: https://github.com/QuantStack/jupyterlab-drawio [contributors]: https://github.com/deathbeds/ipydrawio/graphs/contributors -[history]: https://github.com/deathbeds/ipydrawio/blob/master/CHANGELOG.md +[history]: https://github.com/deathbeds/ipydrawio/blob/main/CHANGELOG.md [binder]: - http://mybinder.org/v2/gh/deathbeds/ipydrawio/master?urlpath=lab/tree/docs/Poster.dio.svg + http://mybinder.org/v2/gh/deathbeds/ipydrawio/main?urlpath=lab/tree/docs/Poster.dio.svg [binder-badge]: https://mybinder.org/badge_logo.svg [workflow-badge]: https://github.com/deathbeds/ipydrawio/workflows/.github/workflows/ci.yml/badge.svg [workflow]: - https://github.com/deathbeds/ipydrawio/actions?query=branch%3Amaster+workflow%3A.github%2Fworkflows%2Fci.yml -[roadmap]: https://github.com/deathbeds/ipydrawio/blob/master/docs/ROADMAP.ipynb + https://github.com/deathbeds/ipydrawio/actions?query=branch%3Amain+workflow%3A.github%2Fworkflows%2Fci.yml +[roadmap]: https://github.com/deathbeds/ipydrawio/blob/main/docs/ROADMAP.ipynb [conda-badge]: https://img.shields.io/conda/vn/conda-forge/ipydrawio [conda]: https://anaconda.org/conda-forge/ipydrawio [pypi-badge]: https://img.shields.io/pypi/v/ipydrawio @@ -214,26 +214,24 @@ limitations under the License. [npm]: https://npmjs.com/package/@deathbeds/ipydrawio [npm-badge]: https://img.shields.io/npm/v/@deathbeds/ipydrawio [cov-badge]: - https://codecov.io/gh/deathbeds/ipydrawio/branch/master/graph/badge.svg?token=9B74VKHQDK + https://codecov.io/gh/deathbeds/ipydrawio/branch/main/graph/badge.svg?token=9B74VKHQDK [cov]: https://codecov.io/gh/deathbeds/ipydrawio [docs-badge]: https://readthedocs.org/projects/ipydrawio/badge/?version=latest [docs]: https://ipydrawio.rtfd.io -[contributing]: https://github.com/deathbeds/ipydrawio/blob/master/CONTRIBUTING.md +[contributing]: https://github.com/deathbeds/ipydrawio/blob/main/CONTRIBUTING.md [documents]: - https://github.com/deathbeds/ipydrawio/blob/master/docs/Diagram%20Document.ipynb + https://github.com/deathbeds/ipydrawio/blob/main/docs/Diagram%20Document.ipynb [rich display]: - https://github.com/deathbeds/ipydrawio/blob/master/docs/Diagram%20Rich%20Display.ipynb -[widgets]: - https://github.com/deathbeds/ipydrawio/blob/master/docs/Diagram%20Widgets.ipynb + https://github.com/deathbeds/ipydrawio/blob/main/docs/Diagram%20Rich%20Display.ipynb +[widgets]: https://github.com/deathbeds/ipydrawio/blob/main/docs/Diagram%20Widgets.ipynb [puppeteer]: https://github.com/puppeteer/puppeteer [@jgraph/draw-image-export2]: https://github.com/jgraph/draw-image-export2 -[apt-txt]: https://github.com/deathbeds/ipydrawio/blob/master/.binder/apt.txt +[apt-txt]: https://github.com/deathbeds/ipydrawio/blob/main/.binder/apt.txt [poster-min]: - https://raw.githubusercontent.com/deathbeds/ipydrawio/master/docs/_static/images/poster.png -[poster]: - https://raw.githubusercontent.com/deathbeds/ipydrawio/master/docs/Poster.dio.svg + https://raw.githubusercontent.com/deathbeds/ipydrawio/main/docs/_static/images/poster.png +[poster]: https://raw.githubusercontent.com/deathbeds/ipydrawio/main/docs/Poster.dio.svg [roadmap]: - https://nbviewer.jupyter.org/github/deathbeds/ipydrawio/blob/master/docs/ROADMAP.ipynb + https://nbviewer.jupyter.org/github/deathbeds/ipydrawio/blob/main/docs/ROADMAP.ipynb [command palette]: https://jupyterlab.readthedocs.io/en/stable/user/commands.html?highlight=command%20palette [launcher]: diff --git a/ROADMAP.md b/ROADMAP.md deleted file mode 100644 index a84214b..0000000 --- a/ROADMAP.md +++ /dev/null @@ -1,40 +0,0 @@ -# ROADMAP - -## 1.0.0 - -> No current blockers, release is imminent - -- [x] support mimerenderer -- [x] rework distribution for JupyterLab 3 -- [x] support (ipy)widgets -- [x] rebrand as `ipydrawio` -- [ ] pypi release - -## 1.0.1 - -> Will likely follow shortly after `1.0.0` - -- [ ] `conda-forge` release -- [ ] docs on `gh-pages` or `readthedocs` - -## Future - -- [ ] `jupyter-videochat` integration -- [ ] `jupyter-mockups` with various lo-fi Jupyter client interfaces -- [ ] richer notebook integration with "live" updating - -``` -Copyright 2023 ipydrawio contributors - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -``` diff --git a/demo/jupyter_lite_config.json b/demo/jupyter_lite_config.json index ac5a729..de0ff7d 100644 --- a/demo/jupyter_lite_config.json +++ b/demo/jupyter_lite_config.json @@ -1,5 +1,6 @@ { "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", @@ -12,8 +13,7 @@ "ignore_sys_prefix": true, "lite_dir": ".", "output_archive": "../build/demo/ipydrawio-lite-1.3.0.tgz", - "output_dir": "../build/demo", - "cache_dir": "../build/.cache/.lite" + "output_dir": "../build/demo" }, "PipliteAddon": { "piplite_urls": [ diff --git a/docs/ROADMAP.ipynb b/docs/ROADMAP.ipynb index da553b1..379d013 100644 --- a/docs/ROADMAP.ipynb +++ b/docs/ROADMAP.ipynb @@ -26,7 +26,6 @@ "\n", "- the out-of-band `puppeteer` provisioning step should be more reliable\n", " - make a separate `conda-forge` package of `puppeteer`/`drawio-export` upstream?\n", - " - use [pyppeteer](https://github.com/pyppeteer/pyppeteer)?\n", "- the download and hosting of the drawio assets should be as efficient as possible" ] }, @@ -58,7 +57,8 @@ " - JupyterLab UI components\n", " - JupyterHub UI components\n", " - Jupyter workflows\n", - " - Jupyter architecture icons" + " - Jupyter architecture icons\n", + " - Jupyter color schemes" ] }, { @@ -67,7 +67,18 @@ "source": [ "## Easy to Compute\n", "\n", - "> Users should be able to use diagrams as part of an interactive, literate, computational process." + "> Users should be able to use diagrams as part of an interactive, literate, computational process.\n" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### Widgets\n", + "\n", + "- create lightweight, editable models of live graph items\n", + "- better encapsulate libraries as widget models\n", + "- enable interaction rules for creating games and simulations" ] }, { @@ -98,6 +109,35 @@ "- enable live updating of drawio shapes from running notebook documents" ] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "## Easy to Collaborate\n", + "\n", + "> Users should find it easy to work with diagrams as part of a team." + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### `jupyter-videochat` integration\n", + "\n", + "- Use [jupyter-videochat][] JSON bus to collaborate with other team members\n", + "\n", + "[jupyter-videochat]: https://github.com/yuvipanda/jupyter-videochat" + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "### `jupyterlab-deck` integration\n", + "\n", + "- integrate with [jupyterlab-deck](https://github.com/deathbeds/jupyterlab-deck) offering layer and page navigation, as well as _Explore_ " + ] + }, { "cell_type": "markdown", "metadata": {}, @@ -109,26 +149,6 @@ "\n", "[pdf.js]: https://github.com/mozilla/pdf.js/" ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "## Easy to Collaborate\n", - "\n", - "- Users should find it easy to work with diagrams as part of a team." - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### jupyter-videochat integration\n", - "\n", - "- Use [jupyter-videochat][] JSON bus to collaborate with other team members\n", - "\n", - "[jupyter-videochat]: https://github.com/yuvipanda/jupyter-videochat" - ] } ], "metadata": { @@ -147,7 +167,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.0" + "version": "3.11.3" }, "toc-autonumbering": true, "toc-showcode": true, diff --git a/docs/about/index.md b/docs/about/index.md index 93cd9ec..f7ddc14 100644 --- a/docs/about/index.md +++ b/docs/about/index.md @@ -1,6 +1,8 @@ # About ```{toctree} +:maxdepth: 3 + ../ROADMAP.ipynb changelog ``` diff --git a/docs/conf.py b/docs/conf.py index 47f2bdf..fd761cf 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -133,7 +133,7 @@ html_sidebars = { html_context = { "github_user": "deathbeds", "github_repo": "ipydrawio", - "github_version": "master", + "github_version": "main", "doc_path": "docs", "demo_tarball": f"_static/ipydrawio-lite-{release}.tgz", } diff --git a/docs/tutorials/designing-jupyter-extensions/index.ipynb b/docs/tutorials/designing-jupyter-extensions/index.ipynb index 1c754a9..2ef8e56 100644 --- a/docs/tutorials/designing-jupyter-extensions/index.ipynb +++ b/docs/tutorials/designing-jupyter-extensions/index.ipynb @@ -22,7 +22,7 @@ "metadata": {}, "source": [ "```{note}\n", - "This tutorial looks at how different kinds of diagram artifacts can be created that support the process of building _Jupyter Extensions_, using IPyDrawio itself as a subject. Each of the images below rendered directly in the browser for this documentation, as well as editable within IPyDrawio.\n", + "This tutorial looks at how different kinds of diagram artifacts can be created that support the process of building _Jupyter Extensions_, using IPyDrawio itself as a subject. Each of the images below renders directly in the browser for this documentation, and ais editable within IPyDrawio.\n", "```" ] }, @@ -31,7 +31,7 @@ "id": "7a5ef077-3d16-4e61-ad47-39b03eb60612", "metadata": {}, "source": [ - "Extensions for [JupyterLab](https://jupyterlab.readthedocs.io/en/stable/extension/extension_dev.html) and [Jupyter Server](https://jupyter-server.readthedocs.io/en/latest/developers/extensions.html?highlight=distributing#distributing-a-server-extension) often developed, and can be distributed, together as a single Python package. While a single author can build, test, document and ship new features _without_ any kinds of pictures, individuals and especially team- and community-driven processes can be enhanced by different visual artifacts that _live next to the code_." + "Extensions for [JupyterLab](https://jupyterlab.readthedocs.io/en/stable/extension/extension_dev.html) and [Jupyter Server](https://jupyter-server.readthedocs.io/en/latest/developers/extensions.html?highlight=distributing#distributing-a-server-extension) are often developed, and can be distributed, together as a single Python package. While a single author can build, test, document, and ship new features _without_ any kinds of pictures, individual, and especially team- and community-driven, processes can be enhanced by different visual artifacts that _live next to the code_." ] }, { @@ -51,7 +51,7 @@ "source": [ "## Gathering Ideas\n", "\n", - "As you start thinking about your extension, who will use it, and how you might build it, IPyDrawio diagrams can capture structured problem-solving approaches effective at capturing, and then leveraging, visual concepts to capture goals and trade-offs." + "As you start thinking about your extension, who will use it, and how you might build it, IPyDrawio diagrams can enable structured problem-solving approaches effective at capturing, and then leveraging, visual concepts to capture goals and trade-offs." ] }, { @@ -83,6 +83,16 @@ "[mindmap]: ../../_static/tutorials/designing-jupyter-extensions/mindmap.dio.svg" ] }, + { + "cell_type": "markdown", + "id": "4201146e-6199-4841-92af-b97ac8b70e43", + "metadata": {}, + "source": [ + "```{note}\n", + "Newer versions of MermaidJS also [text-based mind maps](https://mermaid.js.org/syntax/mindmap.html). These are not yet available on many places where other MermaidJS diagrams work, such as GitHub.\n", + "```" + ] + }, { "cell_type": "markdown", "id": "bec77aa2-80cf-4702-b222-5c40e021b4a1", @@ -121,11 +131,11 @@ "id": "14fe2c2b-de91-4aee-92d1-179d9754468b", "metadata": {}, "source": [ - "### Mermaid Diagrams\n", + "### MermaidJS Diagrams\n", "\n", - "The [mermaid.js](https://mermaid-js.github.io/mermaid) drawio plugin (enabled by default) provides a way to write pithy text descriptions, including:\n", + "The [mermaid.js](https://mermaid.js.org) drawio plugin (enabled by default) provides a way to write pithy text descriptions, including:\n", "\n", - "> _Flowchart, Sequence diagram, Class Diagram, State Diagram, Entity Relationship Diagram, User Journey, Gantt, Pie Chart, Requirement Diagram_" + "> _Flowchart, Sequence diagram, Class Diagram, State Diagram, Entity Relationship Diagram, User Journey, Gantt, Pie Chart, Requirement Diagram, Mindmap, Timeline_" ] }, { @@ -134,7 +144,7 @@ "metadata": {}, "source": [ "```{note}\n", - "From the drawio menu, select _Insert_ ▸ _Advanced_ ▸ _Mermaid_. Paste some mermaid there. The resulting object will _not_ be editable with shape-editing tools, but you _will_ be able to adjust the mermaid syntax later by clicking on it, which can be worth _much_ more over time. \n", + "From the _drawio_ menu, select _Insert_ ▸ _Advanced_ ▸ _Mermaid_. Paste some mermaid there. The resulting object will _not_ be editable with shape-editing tools, but you _will_ be able to adjust the mermaid syntax later by clicking on it, which can be worth _much_ more over time. \n", "```" ] }, @@ -226,7 +236,7 @@ "source": [ "### Comps\n", "\n", - "High-fidelity mockups, or \"comps,\" eventually provide the language used between the designer role and the developer role... even if these roles are filled by the same person." + "High-fidelity mockups, also known as \"composites\" or \"comps,\" eventually provide the language used between the designer role and the developer role... even if these roles are filled by the same person." ] }, { @@ -445,7 +455,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.0" + "version": "3.11.3" } }, "nbformat": 4, diff --git a/packages/ipydrawio-jupyter-templates/README.md b/packages/ipydrawio-jupyter-templates/README.md index dcc3559..4bd382f 100644 --- a/packages/ipydrawio-jupyter-templates/README.md +++ b/packages/ipydrawio-jupyter-templates/README.md @@ -17,7 +17,7 @@ pip install ipydrawio This work is licensed under the [Apache-2.0] License. -[apache-2.0]: https://github.com/deathbeds/ipydrawio/blob/master/LICENSE.txt +[apache-2.0]: https://github.com/deathbeds/ipydrawio/blob/main/LICENSE.txt ``` Copyright 2023 ipydrawio contributors diff --git a/packages/ipydrawio-mathjax/README.md b/packages/ipydrawio-mathjax/README.md index ac73a8c..911f35f 100644 --- a/packages/ipydrawio-mathjax/README.md +++ b/packages/ipydrawio-mathjax/README.md @@ -36,4 +36,4 @@ See the License for the specific language governing permissions and limitations under the License. ``` -[apache-2.0]: https://github.com/deathbeds/ipydrawio/blob/master/LICENSE.txt +[apache-2.0]: https://github.com/deathbeds/ipydrawio/blob/main/LICENSE.txt diff --git a/packages/ipydrawio-mathjax/package.json b/packages/ipydrawio-mathjax/package.json index b4989e2..1008369 100644 --- a/packages/ipydrawio-mathjax/package.json +++ b/packages/ipydrawio-mathjax/package.json @@ -15,7 +15,7 @@ "main": "lib/index.js", "types": "lib/index.d.ts", "dependencies": { - "@deathbeds/ipydrawio-webpack": "^21.1.400", + "@deathbeds/ipydrawio-webpack": "^21.1.600", "@jupyterlab/application": "^3.1.0" }, "devDependencies": { diff --git a/packages/ipydrawio-notebook/README.md b/packages/ipydrawio-notebook/README.md index 8e6bf80..8b5d5c3 100644 --- a/packages/ipydrawio-notebook/README.md +++ b/packages/ipydrawio-notebook/README.md @@ -34,4 +34,4 @@ See the License for the specific language governing permissions and limitations under the License. ``` -[apache-2.0]: https://github.com/deathbeds/ipydrawio/blob/master/LICENSE.txt +[apache-2.0]: https://github.com/deathbeds/ipydrawio/blob/main/LICENSE.txt diff --git a/packages/ipydrawio-pdf/README.md b/packages/ipydrawio-pdf/README.md index 21e30f1..925bc02 100644 --- a/packages/ipydrawio-pdf/README.md +++ b/packages/ipydrawio-pdf/README.md @@ -34,4 +34,4 @@ See the License for the specific language governing permissions and limitations under the License. ``` -[apache-2.0]: https://github.com/deathbeds/ipydrawio/blob/master/LICENSE.txt +[apache-2.0]: https://github.com/deathbeds/ipydrawio/blob/main/LICENSE.txt diff --git a/packages/ipydrawio-webpack/README.md b/packages/ipydrawio-webpack/README.md index ac73a8c..911f35f 100644 --- a/packages/ipydrawio-webpack/README.md +++ b/packages/ipydrawio-webpack/README.md @@ -36,4 +36,4 @@ See the License for the specific language governing permissions and limitations under the License. ``` -[apache-2.0]: https://github.com/deathbeds/ipydrawio/blob/master/LICENSE.txt +[apache-2.0]: https://github.com/deathbeds/ipydrawio/blob/main/LICENSE.txt diff --git a/packages/ipydrawio-webpack/drawio b/packages/ipydrawio-webpack/drawio index b8c9e6c..a117e3d 160000 --- a/packages/ipydrawio-webpack/drawio +++ b/packages/ipydrawio-webpack/drawio @@ -1 +1 @@ -Subproject commit b8c9e6c65774405bb87afe6116a0fedf659245d7 +Subproject commit a117e3d9b0e0bc71653d328d2f68126656f44d9e diff --git a/packages/ipydrawio-webpack/package.json b/packages/ipydrawio-webpack/package.json index 52ef3f7..3b38dbd 100644 --- a/packages/ipydrawio-webpack/package.json +++ b/packages/ipydrawio-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@deathbeds/ipydrawio-webpack", - "version": "21.1.400", + "version": "21.1.600", "description": "A webpack-ready repackaging of drawio", "license": "Apache-2.0", "author": "IPyDrawio Contributors", diff --git a/packages/ipydrawio/README.md b/packages/ipydrawio/README.md index 4a3e36d..ec3df9e 100644 --- a/packages/ipydrawio/README.md +++ b/packages/ipydrawio/README.md @@ -17,7 +17,7 @@ pip install ipydrawio This work is licensed under the [Apache-2.0] License. -[apache-2.0]: https://github.com/deathbeds/ipydrawio/blob/master/LICENSE.txt +[apache-2.0]: https://github.com/deathbeds/ipydrawio/blob/main/LICENSE.txt ``` Copyright 2023 ipydrawio contributors diff --git a/packages/ipydrawio/package.json b/packages/ipydrawio/package.json index b4f2285..cf8bb83 100644 --- a/packages/ipydrawio/package.json +++ b/packages/ipydrawio/package.json @@ -21,7 +21,7 @@ }, "types": "lib/index.d.ts", "dependencies": { - "@deathbeds/ipydrawio-webpack": "^21.1.400", + "@deathbeds/ipydrawio-webpack": "^21.1.600", "@jupyterlab/application": "^3.1.0", "@jupyterlab/launcher": "^3.1.0", "@jupyterlab/mainmenu": "^3.1.0" diff --git a/py_packages/ipydrawio-export/README.md b/py_packages/ipydrawio-export/README.md index 57697a9..479b5dc 100644 --- a/py_packages/ipydrawio-export/README.md +++ b/py_packages/ipydrawio-export/README.md @@ -111,13 +111,13 @@ limitations under the License. [@jgraph/draw-image-export2]: https://github.com/jgraph/draw-image-export2 [apache-2.0]: - https://github.com/deathbeds/ipydrawio/blob/master/py_packages/ipydrawio-export/LICENSE.txt + https://github.com/deathbeds/ipydrawio/blob/main/py_packages/ipydrawio-export/LICENSE.txt [draw2-license]: https://github.com/jgraph/draw-image-export2/blob/master/LICENSE [serverext]: https://jupyter-notebook.readthedocs.io/en/stable/examples/Notebook/Distributing%20Jupyter%20Extensions%20as%20Python%20Packages.html [binder]: - http://mybinder.org/v2/gh/deathbeds/ipydrawio/master?urlpath=lab/tree/docs/Poster.dio.svg + http://mybinder.org/v2/gh/deathbeds/ipydrawio/main?urlpath=lab/tree/docs/Poster.dio.svg [binder-badge]: https://mybinder.org/badge_logo.svg [pypi-badge]: https://img.shields.io/pypi/v/ipydrawio-export [pypi]: https://pypi.org/project/ipydrawio-export @@ -126,9 +126,9 @@ limitations under the License. [workflow-badge]: https://github.com/deathbeds/ipydrawio/workflows/.github/workflows/ci.yml/badge.svg [workflow]: - https://github.com/deathbeds/ipydrawio/actions?query=branch%3Amaster+workflow%3A.github%2Fworkflows%2Fci.yml + https://github.com/deathbeds/ipydrawio/actions?query=branch%3Amain+workflow%3A.github%2Fworkflows%2Fci.yml [cov-badge]: - https://codecov.io/gh/deathbeds/ipydrawio/branch/master/graph/badge.svg?token=9B74VKHQDK + https://codecov.io/gh/deathbeds/ipydrawio/branch/main/graph/badge.svg?token=9B74VKHQDK [cov]: https://codecov.io/gh/deathbeds/ipydrawio [docs-badge]: https://readthedocs.org/projects/ipydrawio/badge/?version=latest [docs]: https://ipydrawio.rtfd.io diff --git a/py_packages/ipydrawio-export/setup.cfg b/py_packages/ipydrawio-export/setup.cfg index c3cb5a9..91cc014 100644 --- a/py_packages/ipydrawio-export/setup.cfg +++ b/py_packages/ipydrawio-export/setup.cfg @@ -24,7 +24,7 @@ license = Apache-2.0 license_files = LICENSE.txt project_urls = Bug Tracker = https://github.com/deathbeds/ipydrawio/issues - Changelog = https://github.com/deathbeds/ipydrawio/blob/master/CHANGELOG.md + Changelog = https://github.com/deathbeds/ipydrawio/blob/main/CHANGELOG.md Coverage = https://app.codecov.io/gh/deathbeds/ipydrawio Documentation = https://ipydrawio.rtfd.io Source Code = https://github.com/deathbeds/ipydrawio diff --git a/py_packages/ipydrawio-mathjax/README.md b/py_packages/ipydrawio-mathjax/README.md index 9675e39..2c65418 100644 --- a/py_packages/ipydrawio-mathjax/README.md +++ b/py_packages/ipydrawio-mathjax/README.md @@ -40,9 +40,9 @@ limitations under the License. ``` [apache-2.0]: - https://github.com/deathbeds/ipydrawio/blob/master/py_packages/ipydrawio-mathjax/LICENSE.txt + https://github.com/deathbeds/ipydrawio/blob/main/py_packages/ipydrawio-mathjax/LICENSE.txt [binder]: - http://mybinder.org/v2/gh/deathbeds/ipydrawio/master?urlpath=lab/tree/docs/Poster.dio.svg + http://mybinder.org/v2/gh/deathbeds/ipydrawio/main?urlpath=lab/tree/docs/Poster.dio.svg [binder-badge]: https://mybinder.org/badge_logo.svg [pypi-badge]: https://img.shields.io/pypi/v/ipydrawio-mathjax [pypi]: https://pypi.org/project/ipydrawio-mathjax @@ -51,9 +51,9 @@ limitations under the License. [workflow-badge]: https://github.com/deathbeds/ipydrawio/workflows/.github/workflows/ci.yml/badge.svg [workflow]: - https://github.com/deathbeds/ipydrawio/actions?query=branch%3Amaster+workflow%3A.github%2Fworkflows%2Fci.yml + https://github.com/deathbeds/ipydrawio/actions?query=branch%3Amain+workflow%3A.github%2Fworkflows%2Fci.yml [cov-badge]: - https://codecov.io/gh/deathbeds/ipydrawio/branch/master/graph/badge.svg?token=9B74VKHQDK + https://codecov.io/gh/deathbeds/ipydrawio/branch/main/graph/badge.svg?token=9B74VKHQDK [cov]: https://codecov.io/gh/deathbeds/ipydrawio [docs-badge]: https://readthedocs.org/projects/ipydrawio/badge/?version=latest [docs]: https://ipydrawio.rtfd.io diff --git a/py_packages/ipydrawio-mathjax/setup.cfg b/py_packages/ipydrawio-mathjax/setup.cfg index 7ff5612..a51185d 100644 --- a/py_packages/ipydrawio-mathjax/setup.cfg +++ b/py_packages/ipydrawio-mathjax/setup.cfg @@ -24,7 +24,7 @@ license = Apache-2.0 license_files = LICENSE.txt project_urls = Bug Tracker = https://github.com/deathbeds/ipydrawio/issues - Changelog = https://github.com/deathbeds/ipydrawio/blob/master/CHANGELOG.md + Changelog = https://github.com/deathbeds/ipydrawio/blob/main/CHANGELOG.md Coverage = https://app.codecov.io/gh/deathbeds/ipydrawio Documentation = https://ipydrawio.rtfd.io Source Code = https://github.com/deathbeds/ipydrawio diff --git a/py_packages/ipydrawio-widgets/README.md b/py_packages/ipydrawio-widgets/README.md index acf5287..9cd8706 100644 --- a/py_packages/ipydrawio-widgets/README.md +++ b/py_packages/ipydrawio-widgets/README.md @@ -68,12 +68,12 @@ limitations under the License. ``` [apache-2.0]: - https://github.com/deathbeds/ipydrawio/blob/master/py_packages/ipydrawio-widgets/LICENSE.txt + https://github.com/deathbeds/ipydrawio/blob/main/py_packages/ipydrawio-widgets/LICENSE.txt [binder]: - http://mybinder.org/v2/gh/deathbeds/ipydrawio/master?urlpath=lab/tree/docs/Poster.dio.svg + http://mybinder.org/v2/gh/deathbeds/ipydrawio/main?urlpath=lab/tree/docs/Poster.dio.svg [binder-badge]: https://mybinder.org/badge_logo.svg [cov-badge]: - https://codecov.io/gh/deathbeds/ipydrawio/branch/master/graph/badge.svg?token=9B74VKHQDK + https://codecov.io/gh/deathbeds/ipydrawio/branch/main/graph/badge.svg?token=9B74VKHQDK [binder-badge]: https://mybinder.org/badge_logo.svg [pypi-badge]: https://img.shields.io/pypi/v/ipydrawio-widgets [pypi]: https://pypi.org/project/ipydrawio-widgets @@ -82,9 +82,9 @@ limitations under the License. [workflow-badge]: https://github.com/deathbeds/ipydrawio/workflows/.github/workflows/ci.yml/badge.svg [workflow]: - https://github.com/deathbeds/ipydrawio/actions?query=branch%3Amaster+workflow%3A.github%2Fworkflows%2Fci.yml + https://github.com/deathbeds/ipydrawio/actions?query=branch%3Amain+workflow%3A.github%2Fworkflows%2Fci.yml [cov-badge]: - https://codecov.io/gh/deathbeds/ipydrawio/branch/master/graph/badge.svg?token=9B74VKHQDK + https://codecov.io/gh/deathbeds/ipydrawio/branch/main/graph/badge.svg?token=9B74VKHQDK [cov]: https://codecov.io/gh/deathbeds/ipydrawio [docs-badge]: https://readthedocs.org/projects/ipydrawio/badge/?version=latest [docs]: https://ipydrawio.rtfd.io diff --git a/py_packages/ipydrawio-widgets/setup.cfg b/py_packages/ipydrawio-widgets/setup.cfg index 214e2dd..76ef51e 100644 --- a/py_packages/ipydrawio-widgets/setup.cfg +++ b/py_packages/ipydrawio-widgets/setup.cfg @@ -24,7 +24,7 @@ license = Apache-2.0 license_files = LICENSE.txt project_urls = Bug Tracker = https://github.com/deathbeds/ipydrawio/issues - Changelog = https://github.com/deathbeds/ipydrawio/blob/master/CHANGELOG.md + Changelog = https://github.com/deathbeds/ipydrawio/blob/main/CHANGELOG.md Coverage = https://app.codecov.io/gh/deathbeds/ipydrawio Documentation = https://ipydrawio.rtfd.io Source Code = https://github.com/deathbeds/ipydrawio diff --git a/py_packages/ipydrawio/README.md b/py_packages/ipydrawio/README.md index 09a1a89..fa9476d 100644 --- a/py_packages/ipydrawio/README.md +++ b/py_packages/ipydrawio/README.md @@ -70,7 +70,7 @@ pip install ipydrawio[all] - or follow the [Installation instructions](#installation) and **Start JupyterLab** - Open a diagram, by doing one of: - Creating a - + Diagram\_ from the [Launcher][] - Uploading a diagram created on [diagrams.net](https://diagrams.net) with the _[File Manager][]_ and double clicking it @@ -191,22 +191,22 @@ See the License for the specific language governing permissions and limitations under the License. ``` -[apache 2.0]: https://github.com/deathbeds/ipydrawio/blob/master/LICENSE.txt +[apache 2.0]: https://github.com/deathbeds/ipydrawio/blob/main/LICENSE.txt [@jgraph/drawio]: https://github.com/jgraph/drawio [@jgraph/draw-image-export2]: https://github.com/jgraph/draw-image-export2 [jupyterlab]: https://github.com/jupyterlab/jupyterlab [drawio]: https://www.diagrams.net [quantstack/jupyterlab-drawio]: https://github.com/QuantStack/jupyterlab-drawio [contributors]: https://github.com/deathbeds/ipydrawio/graphs/contributors -[history]: https://github.com/deathbeds/ipydrawio/blob/master/CHANGELOG.md +[history]: https://github.com/deathbeds/ipydrawio/blob/main/CHANGELOG.md [binder]: - http://mybinder.org/v2/gh/deathbeds/ipydrawio/master?urlpath=lab/tree/docs/Poster.dio.svg + http://mybinder.org/v2/gh/deathbeds/ipydrawio/main?urlpath=lab/tree/docs/Poster.dio.svg [binder-badge]: https://mybinder.org/badge_logo.svg [workflow-badge]: https://github.com/deathbeds/ipydrawio/workflows/.github/workflows/ci.yml/badge.svg [workflow]: - https://github.com/deathbeds/ipydrawio/actions?query=branch%3Amaster+workflow%3A.github%2Fworkflows%2Fci.yml -[roadmap]: https://github.com/deathbeds/ipydrawio/blob/master/docs/ROADMAP.ipynb + https://github.com/deathbeds/ipydrawio/actions?query=branch%3Amain+workflow%3A.github%2Fworkflows%2Fci.yml +[roadmap]: https://github.com/deathbeds/ipydrawio/blob/main/docs/ROADMAP.ipynb [conda-badge]: https://img.shields.io/conda/vn/conda-forge/ipydrawio [conda]: https://anaconda.org/conda-forge/ipydrawio [pypi-badge]: https://img.shields.io/pypi/v/ipydrawio @@ -214,26 +214,24 @@ limitations under the License. [npm]: https://npmjs.com/package/@deathbeds/ipydrawio [npm-badge]: https://img.shields.io/npm/v/@deathbeds/ipydrawio [cov-badge]: - https://codecov.io/gh/deathbeds/ipydrawio/branch/master/graph/badge.svg?token=9B74VKHQDK + https://codecov.io/gh/deathbeds/ipydrawio/branch/main/graph/badge.svg?token=9B74VKHQDK [cov]: https://codecov.io/gh/deathbeds/ipydrawio [docs-badge]: https://readthedocs.org/projects/ipydrawio/badge/?version=latest [docs]: https://ipydrawio.rtfd.io -[contributing]: https://github.com/deathbeds/ipydrawio/blob/master/CONTRIBUTING.md +[contributing]: https://github.com/deathbeds/ipydrawio/blob/main/CONTRIBUTING.md [documents]: - https://github.com/deathbeds/ipydrawio/blob/master/docs/Diagram%20Document.ipynb + https://github.com/deathbeds/ipydrawio/blob/main/docs/Diagram%20Document.ipynb [rich display]: - https://github.com/deathbeds/ipydrawio/blob/master/docs/Diagram%20Rich%20Display.ipynb -[widgets]: - https://github.com/deathbeds/ipydrawio/blob/master/docs/Diagram%20Widgets.ipynb + https://github.com/deathbeds/ipydrawio/blob/main/docs/Diagram%20Rich%20Display.ipynb +[widgets]: https://github.com/deathbeds/ipydrawio/blob/main/docs/Diagram%20Widgets.ipynb [puppeteer]: https://github.com/puppeteer/puppeteer [@jgraph/draw-image-export2]: https://github.com/jgraph/draw-image-export2 -[apt-txt]: https://github.com/deathbeds/ipydrawio/blob/master/.binder/apt.txt +[apt-txt]: https://github.com/deathbeds/ipydrawio/blob/main/.binder/apt.txt [poster-min]: - https://raw.githubusercontent.com/deathbeds/ipydrawio/master/docs/_static/images/poster.png -[poster]: - https://raw.githubusercontent.com/deathbeds/ipydrawio/master/docs/Poster.dio.svg + https://raw.githubusercontent.com/deathbeds/ipydrawio/main/docs/_static/images/poster.png +[poster]: https://raw.githubusercontent.com/deathbeds/ipydrawio/main/docs/Poster.dio.svg [roadmap]: - https://nbviewer.jupyter.org/github/deathbeds/ipydrawio/blob/master/docs/ROADMAP.ipynb + https://nbviewer.jupyter.org/github/deathbeds/ipydrawio/blob/main/docs/ROADMAP.ipynb [command palette]: https://jupyterlab.readthedocs.io/en/stable/user/commands.html?highlight=command%20palette [launcher]: diff --git a/py_packages/ipydrawio/setup.cfg b/py_packages/ipydrawio/setup.cfg index 01f8f29..b66ca3e 100644 --- a/py_packages/ipydrawio/setup.cfg +++ b/py_packages/ipydrawio/setup.cfg @@ -24,7 +24,7 @@ license = Apache-2.0 license_files = LICENSE.txt project_urls = Bug Tracker = https://github.com/deathbeds/ipydrawio/issues - Changelog = https://github.com/deathbeds/ipydrawio/blob/master/CHANGELOG.md + Changelog = https://github.com/deathbeds/ipydrawio/blob/main/CHANGELOG.md Coverage = https://app.codecov.io/gh/deathbeds/ipydrawio Documentation = https://ipydrawio.rtfd.io Source Code = https://github.com/deathbeds/ipydrawio diff --git a/scripts/project.py b/scripts/project.py index 95f71fc..c0be0da 100644 --- a/scripts/project.py +++ b/scripts/project.py @@ -601,7 +601,7 @@ CMD_LIST_EXTENSIONS = ["jupyter", "labextension", "list"] CMD_LAB = ["jupyter", "lab", "--no-browser", "--debug"] # conda building -RECIPE = ROOT / "conda.recipe/meta.yaml" +RECIPE = GH / "conda.recipe/meta.yaml" CONDA_BLD = BUILD / "conda-bld" CONDARC = GH / ".condarc" # could be mambabuild diff --git a/yarn.lock b/yarn.lock index d2796a0..622e486 100644 --- a/yarn.lock +++ b/yarn.lock @@ -99,14 +99,14 @@ "@jupyterlab/application" "^3.1.0" "@deathbeds/ipydrawio-webpack@file:packages/ipydrawio-webpack": - version "21.1.400" + version "21.1.600" dependencies: "@jupyterlab/application" "^3.1.0" "@deathbeds/ipydrawio@file:packages/ipydrawio": version "1.3.0" dependencies: - "@deathbeds/ipydrawio-webpack" "^21.1.400" + "@deathbeds/ipydrawio-webpack" "^21.1.600" "@jupyterlab/application" "^3.1.0" "@jupyterlab/launcher" "^3.1.0" "@jupyterlab/mainmenu" "^3.1.0"