Skip to content

Commit 408c038

Browse files
authored
Merge pull request #2 from bollwyvl/bump/rf31
Set lower bound on Robot Framework 3.1 (and seleniumlibrary)
2 parents 3ee1f4d + b4fdb36 commit 408c038

File tree

7 files changed

+23
-18
lines changed

7 files changed

+23
-18
lines changed

anaconda-project.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ commands:
5454
env_spec: rfjl37
5555

5656
install:win:
57-
windows: >
58-
python -m pip install _artifacts\\sdist\\robotframework-jupyterlibrary-0.1.0.tar.gz --no-deps --ignore-installed -vv
57+
windows: python -m pip install _artifacts\\sdist\\robotframework-jupyterlibrary-0.1.0.tar.gz --no-deps --ignore-installed -vv
5958
env_spec: win_rfjl37
6059

6160
env_specs:
@@ -65,20 +64,19 @@ env_specs:
6564
- flake8
6665
- geckodriver
6766
- isort
68-
- jupyterlab
67+
- jupyterlab >=0.35
6968
- nodejs
7069
- pillow
7170
- python-chromedriver-binary
72-
- robotframework
71+
- robotframework >=3.1
7372
- robotframework-lint
74-
- robotframework-seleniumlibrary
73+
- robotframework-seleniumlibrary >=3.2
7574
- six
7675
- pip:
7776
- nteract_on_jupyter
7877
channels:
7978
- conda-forge
8079
- defaults
81-
8280
rfjl37:
8381
inherit_from:
8482
- robotframework-jupyterlibrary

ci/steps.conda.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ steps:
1111
flake8
1212
geckodriver
1313
isort
14-
jupyterlab
14+
jupyterlab>=0.35
1515
nodejs>=10,<11
1616
pillow
1717
python-chromedriver-binary
1818
python>=3.6,<3.7
19-
robotframework
19+
robotframework>=3.1
2020
robotframework-lint
21-
robotframework-seleniumlibrary
21+
robotframework-seleniumlibrary>=3.2
2222
- script: pip install nteract_on_jupyter --no-deps --ignore-installed -vv
2323
displayName: Pip dependencies

environment.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ dependencies:
99
- flake8
1010
- geckodriver
1111
- isort
12-
- jupyterlab
12+
- jupyterlab >=0.35
1313
- nodejs
1414
- pillow
1515
- python-chromedriver-binary
16-
- robotframework
16+
- robotframework >=3.1
1717
- robotframework-lint
18-
- robotframework-seleniumlibrary
18+
- robotframework-seleniumlibrary >=3.2
1919
- six
2020
- pip:
2121
- nteract_on_jupyter

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ classifiers =
2525

2626
[options]
2727
install_requires =
28-
robotframework >3
29-
robotframework-seleniumlibrary
28+
robotframework >=3.1
29+
robotframework-seleniumlibrary >=3.2
3030
pillow
3131
six
3232
package_dir =

src/JupyterLibrary/resources/jupyterlab/Launcher.robot

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ Resource JupyterLibrary/resources/jupyterlab/Selectors.robot
66
Launch a new JupyterLab Document
77
[Arguments] ${kernel}=Python 3 ${category}=Notebook
88
[Documentation] Use the JupyterLab launcher to launch Notebook or Console
9-
Click Element xpath:${JLAB XP CARD}[@title='${kernel}'][@data-category='${category}']
9+
${sel} = Catenate SEPARATOR=${EMPTY} ${JLAB XP CARD} [@title='${kernel}'][@data-category='${category}']
10+
Click Element xpath:${sel}
1011
Wait Until Page Does Not Contain Element css:${JLAB CSS SPINNER}
1112
Wait Until Page Contains Element css:${JLAB CSS CELL}
1213
Sleep 0.1s

src/JupyterLibrary/resources/jupyterlab/Shell.robot

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,20 @@ Wait for JupyterLab Splash Screen
2121
Click JupyterLab Menu
2222
[Arguments] ${menu_label}
2323
[Documentation] Click a top-level JupyterLab Menu bar, e.g. File, Help, etc.
24-
${xpath} = Set Variable ${JLAB XP TOP}${JLAB XP MENU LABEL}[text() = '${menu_label}']
24+
${xpath} = Catenate SEPARATOR=${EMPTY}
25+
... ${JLAB XP TOP}
26+
... ${JLAB XP MENU LABEL}
27+
... [text() = '${menu_label}']
2528
Wait Until Page Contains Element ${xpath}
2629
Mouse Over ${xpath}
2730
Click Element ${xpath}
2831

2932
Click JupyterLab Menu Item
3033
[Arguments] ${item_label}
3134
[Documentation] Click a top-level JupyterLab Menu Item (not File, Help, etc.)
32-
${item} = Set Variable ${JLAB XP MENU ITEM LABEL}[text() = '${item_label}']
35+
${item} = Catenate SEPARATOR=${EMPTY}
36+
... ${JLAB XP MENU ITEM LABEL}
37+
... [text() = '${item_label}']
3338
Wait Until Page Contains Element ${item}
3439
Mouse Over ${item}
3540
Click Element ${item}

src/JupyterLibrary/resources/jupyterlab/Sidebar.robot

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ Maybe Open JupyterLab Sidebar
1313
[Arguments] ${data id}
1414
[Documentation] Attempt to open a JupyterLab sidebar (if not already open)
1515
Maybe Close JupyterLab Sidebar
16-
Click Element css:${JLAB CSS SIDEBAR TAB}[data-id="${data id}"]
16+
${sel} = Catenate SEPARATOR=${EMPTY} ${JLAB CSS SIDEBAR TAB} [data-id="${data id}"]
17+
Click Element css:${sel}

0 commit comments

Comments
 (0)