Skip to content

Commit 2ad777a

Browse files
authored
Update to drawio 20.5.0 (QuantStack#104)
1 parent c094c53 commit 2ad777a

File tree

37 files changed

+2731
-2451
lines changed

37 files changed

+2731
-2451
lines changed

.binder/environment.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ dependencies:
2525
# demo toys
2626
- graphviz2drawio
2727
- jupyter-lsp-python-lsp-server
28+
- jupyterlab-deck
2829
- jupyterlab-link-share
2930
- jupyterlab-lsp
3031
- matplotlib-base
@@ -60,8 +61,9 @@ dependencies:
6061
- sphinx >=5,<6
6162
- sphinx-jsonschema
6263
- sphinxext-rediraffe
64+
- ssort
6365
- pip:
64-
- jupyterlite ==0.1.0b12
66+
- jupyterlite ==0.1.0b14
6567

6668
### ipydrawio-docs-deps ###
6769

@@ -72,17 +74,16 @@ dependencies:
7274

7375
# core
7476
- doit
75-
- nodejs >=12,!=13.*,<15
77+
- nodejs >=16,<17
7678
- python # this gets patched in ci
7779
# run
7880
- ipywidgets >=7.6,<9
79-
- jupyterlab >=3.4.5,<4.0.0a0
81+
- jupyterlab >=3.5.0,<4.0.0a0
8082
- jupyterlab_widgets >=1
8183
- lxml
8284
- pillow
8385
- pypdf2
8486
- requests_cache
85-
- retrolab
8687
# building
8788
- flit >=3.7.1
8889
- pip
@@ -106,7 +107,7 @@ dependencies:
106107
# acceptance testing
107108
- firefox =102
108109
- geckodriver >=0.28.0
109-
- robotframework >=4
110+
- robotframework >=6
110111
- robotframework-pabot
111112
- robotframework-seleniumlibrary
112113
# reporting
File renamed without changes.

.binder/postBuild

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ doit()
3333
doit("list", "--all", "--status")
3434

3535
shutil.copy2(".binder/overrides.json", SETTINGS / "overrides.json")
36-
shutil.copy2(".binder/jupyter_notebook_config.json", "jupyter_notebook_config.json")
36+
Path(".jupyter").mkdir(exist_ok=True)
37+
shutil.copy2(".binder/jupyter_config.json", ".jupyter/jupyter_config.json")
3738

3839
sys.exit(doit())

.github/environment.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,16 @@ dependencies:
2525

2626
# core
2727
- doit
28-
- nodejs >=12,!=13.*,<15
28+
- nodejs >=16,<17
2929
- python # this gets patched in ci
3030
# run
3131
- ipywidgets >=7.6,<9
32-
- jupyterlab >=3.4.5,<4.0.0a0
32+
- jupyterlab >=3.5.0,<4.0.0a0
3333
- jupyterlab_widgets >=1
3434
- lxml
3535
- pillow
3636
- pypdf2
3737
- requests_cache
38-
- retrolab
3938
# building
4039
- flit >=3.7.1
4140
- pip
@@ -59,7 +58,7 @@ dependencies:
5958
# acceptance testing
6059
- firefox =102
6160
- geckodriver >=0.28.0
62-
- robotframework >=4
61+
- robotframework >=6
6362
- robotframework-pabot
6463
- robotframework-seleniumlibrary
6564
# reporting

.github/pip-build.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ requests-cache
1919
robotframework
2020
robotframework-lint
2121
setuptools
22+
ssort
2223
wheel

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,18 @@
66

77
### ipydrawio 1.2.2
88

9+
- as `retrolab` no longer supports installation next to `jupyterlab 3.5`, it is no
10+
longer under test... but might still work.
11+
- support for `notebook 7` will become available some time after a final release
12+
- though `jupyterlab 4` will be likely be supported first
13+
914
#### @deathbeds/ipydrawio 1.2.2
1015

1116
#### @deathbeds/ipydrawio-notebook 1.2.2
1217

13-
#### @deathbeds/ipydrawio-webpack 20.2.801
18+
#### @deathbeds/ipydrawio-webpack 20.5.0
19+
20+
- updates to drawio v20.5.0
1421

1522
#### @deathbeds/ipydrawio-jupyter-templates 1.2.2
1623

atest/_Keywords.robot

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Create Lab Launch Command
7777
Create Notebok Server Config
7878
[Documentation] Copies in notebook server config file to disables npm/build checks
7979
[Arguments] ${home}
80-
Copy File ${FIXTURES}${/}${NBSERVER CONF} ${home}${/}${NBSERVER CONF}
80+
Copy File ${FIXTURES}${/}${NBSERVER CONF} ${home}${/}.jupyter${/}${NBSERVER CONF}
8181

8282
Setup Suite For Screenshots
8383
[Arguments] ${folder}
@@ -175,7 +175,7 @@ Ensure All Kernels Are Shut Down
175175
IF ${els.__len__()} Click Element ${accept}
176176

177177
Open Command Palette
178-
Ensure Command Palette is Open
178+
Really Ensure Command Palette is Open
179179
Wait Until Element Is Visible ${CMD PALETTE INPUT}
180180
Click Element ${CMD PALETTE INPUT}
181181

@@ -232,6 +232,10 @@ Ensure Command Palette is Open
232232
... css:.lm-TabBar-tab[data-id="command-palette"]:not(.lm-mod-current)
233233
${els} = Get WebElements ${sel}
234234
IF ${els.__len__()} Click Element ${sel}
235+
Wait Until Page Does Not Contain Element ${sel} timeout=0.1s
236+
237+
Really Ensure Command Palette Is Open
238+
Wait Until Keyword Succeeds 5x 0.1s Ensure Command Palette is Open
235239

236240
Ensure Sidebar Is Closed
237241
[Arguments] ${side}=left

atest/_Variables.robot

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
*** Variables ***
1818
${FIXTURES} ${CURDIR}${/}fixtures
19-
${NBSERVER CONF} jupyter_notebook_config.json
19+
${NBSERVER CONF} jupyter_config.json
2020
${SPLASH} id:jupyterlab-splash
2121
# to help catch hard-coded paths
2222
${BASE} /@est/
@@ -104,8 +104,6 @@ ${XP DIO FORMAT PANE VISIBLE} ${XP DIO FORMAT PANE}\[not(contains(@sty
104104
${XP DIO PAGE SIZE} //div[contains(@class, "geFormatSection")][contains(., "Paper Size")]//select
105105
# mime
106106
${MIME STDERR} application/vnd.jupyter.stderr
107-
# retro
108-
${CSS RETRO TREE DIO BTN} css:button[title='${CREATE A BLANK}']
109107
# docs
110108
${TUTORIALS} ${ROOT}${/}docs${/}tutorials
111109
${CLIB TUTORIAL} ${TUTORIALS}${/}working-with-custom-libraries${/}index.ipynb

atest/lab/Widget.robot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ Diagram Should Contain
116116
Update The Diagram Widget Value
117117
[Arguments] ${path}
118118
${xml} = Get File ${path}
119+
Click Element css:.jp-Cell:last-child
119120
Add and Run JupyterLab Code Cell diagram.source.value = '''${xml.strip()}'''
120121
Press Keys None ESC
121122
Press Keys None UP

0 commit comments

Comments
 (0)