Skip to content

Commit

Permalink
headers, broaden node range, relock yarn (#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
bollwyvl authored Apr 11, 2021
1 parent 7a31ede commit 8031573
Show file tree
Hide file tree
Showing 91 changed files with 1,798 additions and 586 deletions.
102 changes: 65 additions & 37 deletions .binder/environment.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,86 @@
name: ipydrawio
# a heavy demo environment for interactive testing

# Copyright 2021 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.

name: ipydrawio-demo

channels:
- conda-forge
- nodefaults

dependencies:
# demo toys
- bqplot
- graphviz2drawio
- jupyter-lsp-python-plugins
- jupyter-videochat
- jupyterlab-classic
- jupyterlab-lsp
- jupyterlab-tour
- matplotlib-base
- nbgitpuller
- networkx
- pygraphviz
- python-graphviz
- segno
- shapely
- tabulate
- wxyz_datagrid
- wxyz_json_schema_form
- wxyz_lab
- wxyz_svg
# TODO: get on conda-forge
# - qrcode-artistic

### ipydrawio-dev-deps ###

# core
- doit
- nodejs >=12,!=13.*,<15
- python # this gets patched in ci
# run
- ipywidgets >=7.6
- jedi <0.18.0
- jupyterlab >=3.0.13,<4.0.0a0
- jupyterlab_widgets >=1
- lxml
- networkx
- nodejs >=12,<13.0.0a0
- pandas
- pillow
- pypdf2
- shapely
- tabulate
# linting and testing
- babel
- requests_cache
# building
- pip
- twine
- wheel
# linting
- black
- doit
- flake8
- httpx
- isort <5
- json-e
- isort >=5
- pyflakes
- robotframework-lint
# unit testing
- pytest
- pytest-console-scripts
- pytest-cov
- pytest-tornasync
- requests_cache
# acceptance testing
- firefox =78
- geckodriver >=0.28.0
- robotframework >=4
- robotframework-lint
- robotframework-jupyterlibrary
- robotframework-pabot
# python cruft
- python >=3.8,<3.9.0a0
- pip
- twine
- wheel
# demo toys
- bqplot
- graphviz2drawio
- jupyter-lsp-python-plugins
- jupyter-videochat
- jupyterlab-classic
- jupyterlab-lsp
- matplotlib-base
- nbgitpuller
- pygraphviz
- python-graphviz
- wxyz_datagrid
- wxyz_lab
# for ipython
- jedi <0.18.0
# binder pins
- jupyter_telemetry >=0.1.0 # ick, but fails pip check
- robotframework-seleniumlibrary
# reporting
- codecov

### ipydrawio-dev-deps ###
3 changes: 0 additions & 3 deletions .binder/labextensions.txt

This file was deleted.

35 changes: 25 additions & 10 deletions .binder/postBuild
Original file line number Diff line number Diff line change
@@ -1,22 +1,37 @@
#!/usr/bin/env python
from pathlib import Path

# Copyright 2021 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.

import shutil
import subprocess
import sys
import shutil
from pathlib import Path

SETTINGS = Path(sys.prefix) / "share/jupyter/lab/settings"
SETTINGS.mkdir(parents=True, exist_ok=True)


def doit(*args):
return subprocess.call(["doit", *args])

doit = lambda *args: subprocess.call(["doit", *args])

doit("list", "--all", "--status")
doit("-n4")
doit("list", "--all", "--status")

SETTINGS = Path(sys.prefix) / "share/jupyter/lab/settings"
SETTINGS.mkdir(parents=True, exist_ok=True)

shutil.copy2(".binder/overrides.json", SETTINGS / "overrides.json")
shutil.copy2(
".binder/jupyter_notebook_config.json",
"jupyter_notebook_config.json"
)
shutil.copy2(".binder/jupyter_notebook_config.json", "jupyter_notebook_config.json")

sys.exit(doit())
55 changes: 41 additions & 14 deletions .github/environment.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,63 @@
name: ipydrawio
# a sufficient environment for acceptance testing

# Copyright 2021 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.

name: ipydrawio-dev

channels:
- conda-forge
- nodefaults

dependencies:
- black
- codecov
### ipydrawio-dev-deps ###

# core
- doit
- firefox =78
- flake8
- geckodriver >=0.28.0
- nodejs >=12,!=13.*,<15
- python # this gets patched in ci
# run
- ipywidgets >=7.6
- isort >=5
- jedi <0.18.0
- jupyterlab >=3.0.13,<4.0.0a0
- jupyterlab_widgets >=1
- lxml
- nodejs >=12,<13.0.0a0
- pillow
- pypdf2
- requests_cache
# building
- pip
- twine
- wheel
# linting
- black
- flake8
- isort >=5
- pyflakes
- pypdf2
- robotframework-lint
# unit testing
- pytest
- pytest-console-scripts
- pytest-cov
- pytest-tornasync
- python
- requests_cache
# acceptance testing
- firefox =78
- geckodriver >=0.28.0
- robotframework >=4
- robotframework-lint
- robotframework-pabot
- robotframework-seleniumlibrary
- twine
- wheel
# reporting
- codecov

### ipydrawio-dev-deps ###
16 changes: 16 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
# main continuous integration workflow

# Copyright 2021 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.

on:
push:
branches:
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,19 @@ For pre-releases of the previously-named package, see the [old CHANGELOG][]

[old changelog]:
https://github.com/deathbeds/ipydrawio/tree/3a577ac/CHANGELOG.md

```
Copyright 2021 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.
```
16 changes: 16 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,19 @@ doit dist
npm logout
```
- [ ] handle `conda-forge` feedstock tasks

```
Copyright 2021 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.
```
26 changes: 24 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,17 @@ pip install ipydrawio ipydrawio-export
> please see _Diagram_ options available in the _Command Palette_ and
> various _Main Menu_ menus.
## Configuring

- Change the _Diagram Theme_ from the _Settings_

> Use _Advanced Settings_ to modify drawio embedding parameters
### PDF: Lab and Server extensions

`ipydrawio-export` can generate print-quality PDF. This approach relies on a
headless browser, powered by [@jgraph/draw-image-export2] and ultimately
`puppeteer` which in turn requires `nodejs`.
headless browser, powered by [@jgraph/draw-image-export2], `puppeteer`, and
`nodejs`.

- **native dependencies** as required to appease `puppeteer`
- if running in `docker`, this can be a bit trial-and-error
Expand Down Expand Up @@ -105,6 +111,22 @@ The original source code vendored in this package from:
- [@jgraph/drawio][]
- [@jgraph/draw-image-export2][]
```
Copyright 2021 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.
```
[apache 2.0]: https://github.com/deathbeds/ipydrawio/blob/master/LICENSE.txt
[@jgraph/drawio]: https://github.com/jgraph/drawio
[@jgraph/draw-image-export2]: https://github.com/jgraph/draw-image-export2
Expand Down
16 changes: 16 additions & 0 deletions ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,19 @@
- [ ] `jupyter-videochat` integration
- [ ] `jupyter-mockups` with various lo-fi Jupyter client interfaces
- [ ] richer notebook integration with "live" updating

```
Copyright 2021 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.
```
14 changes: 14 additions & 0 deletions atest/Formats.robot
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright 2021 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.

*** Settings ***
Documentation Are export formats sane?
Resource _Keywords.robot
Expand Down
Loading

0 comments on commit 8031573

Please sign in to comment.