From c4600d95a35938037c1fa8f31f99b708e40a6a8d Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 9 Dec 2018 15:29:36 -0500 Subject: [PATCH 1/2] set lower bound on (new) rf and rf-sl --- anaconda-project.yml | 6 +++--- ci/steps.conda.yml | 6 +++--- environment.yml | 6 +++--- setup.cfg | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/anaconda-project.yml b/anaconda-project.yml index 34a88033..c13d45ec 100644 --- a/anaconda-project.yml +++ b/anaconda-project.yml @@ -65,13 +65,13 @@ env_specs: - flake8 - geckodriver - isort - - jupyterlab + - jupyterlab>=0.35 - nodejs - pillow - python-chromedriver-binary - - robotframework + - robotframework>=3.1 - robotframework-lint - - robotframework-seleniumlibrary + - robotframework-seleniumlibrary>=3.2 - six - pip: - nteract_on_jupyter diff --git a/ci/steps.conda.yml b/ci/steps.conda.yml index f297a227..2efd1921 100644 --- a/ci/steps.conda.yml +++ b/ci/steps.conda.yml @@ -11,13 +11,13 @@ steps: flake8 geckodriver isort - jupyterlab + jupyterlab>=0.35 nodejs>=10,<11 pillow python-chromedriver-binary python>=3.6,<3.7 - robotframework + robotframework>=3.1 robotframework-lint - robotframework-seleniumlibrary + robotframework-seleniumlibrary>=3.2 - script: pip install nteract_on_jupyter --no-deps --ignore-installed -vv displayName: Pip dependencies diff --git a/environment.yml b/environment.yml index e7627887..c5251dce 100644 --- a/environment.yml +++ b/environment.yml @@ -9,13 +9,13 @@ dependencies: - flake8 - geckodriver - isort - - jupyterlab + - jupyterlab >=0.45 - nodejs - pillow - python-chromedriver-binary - - robotframework + - robotframework >=3.1 - robotframework-lint - - robotframework-seleniumlibrary + - robotframework-seleniumlibrary >=3.2 - six - pip: - nteract_on_jupyter diff --git a/setup.cfg b/setup.cfg index d6df5c76..326443df 100644 --- a/setup.cfg +++ b/setup.cfg @@ -25,8 +25,8 @@ classifiers = [options] install_requires = - robotframework >3 - robotframework-seleniumlibrary + robotframework >=3.1 + robotframework-seleniumlibrary >=3.2 pillow six package_dir = From b4fdb36735d1486b586a4af776f1639f56fc9acf Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Sun, 9 Dec 2018 15:55:21 -0500 Subject: [PATCH 2/2] handle new rf behavior with catenate --- anaconda-project.yml | 10 ++++------ environment.yml | 2 +- src/JupyterLibrary/resources/jupyterlab/Launcher.robot | 3 ++- src/JupyterLibrary/resources/jupyterlab/Shell.robot | 9 +++++++-- src/JupyterLibrary/resources/jupyterlab/Sidebar.robot | 3 ++- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/anaconda-project.yml b/anaconda-project.yml index c13d45ec..156212f5 100644 --- a/anaconda-project.yml +++ b/anaconda-project.yml @@ -54,8 +54,7 @@ commands: env_spec: rfjl37 install:win: - windows: > - python -m pip install _artifacts\\sdist\\robotframework-jupyterlibrary-0.1.0.tar.gz --no-deps --ignore-installed -vv + windows: python -m pip install _artifacts\\sdist\\robotframework-jupyterlibrary-0.1.0.tar.gz --no-deps --ignore-installed -vv env_spec: win_rfjl37 env_specs: @@ -65,20 +64,19 @@ env_specs: - flake8 - geckodriver - isort - - jupyterlab>=0.35 + - jupyterlab >=0.35 - nodejs - pillow - python-chromedriver-binary - - robotframework>=3.1 + - robotframework >=3.1 - robotframework-lint - - robotframework-seleniumlibrary>=3.2 + - robotframework-seleniumlibrary >=3.2 - six - pip: - nteract_on_jupyter channels: - conda-forge - defaults - rfjl37: inherit_from: - robotframework-jupyterlibrary diff --git a/environment.yml b/environment.yml index c5251dce..f9cb9d33 100644 --- a/environment.yml +++ b/environment.yml @@ -9,7 +9,7 @@ dependencies: - flake8 - geckodriver - isort - - jupyterlab >=0.45 + - jupyterlab >=0.35 - nodejs - pillow - python-chromedriver-binary diff --git a/src/JupyterLibrary/resources/jupyterlab/Launcher.robot b/src/JupyterLibrary/resources/jupyterlab/Launcher.robot index e727564f..a79c814e 100644 --- a/src/JupyterLibrary/resources/jupyterlab/Launcher.robot +++ b/src/JupyterLibrary/resources/jupyterlab/Launcher.robot @@ -6,7 +6,8 @@ Resource JupyterLibrary/resources/jupyterlab/Selectors.robot Launch a new JupyterLab Document [Arguments] ${kernel}=Python 3 ${category}=Notebook [Documentation] Use the JupyterLab launcher to launch Notebook or Console - Click Element xpath:${JLAB XP CARD}[@title='${kernel}'][@data-category='${category}'] + ${sel} = Catenate SEPARATOR=${EMPTY} ${JLAB XP CARD} [@title='${kernel}'][@data-category='${category}'] + Click Element xpath:${sel} Wait Until Page Does Not Contain Element css:${JLAB CSS SPINNER} Wait Until Page Contains Element css:${JLAB CSS CELL} Sleep 0.1s diff --git a/src/JupyterLibrary/resources/jupyterlab/Shell.robot b/src/JupyterLibrary/resources/jupyterlab/Shell.robot index 7eef010e..f12ee604 100644 --- a/src/JupyterLibrary/resources/jupyterlab/Shell.robot +++ b/src/JupyterLibrary/resources/jupyterlab/Shell.robot @@ -21,7 +21,10 @@ Wait for JupyterLab Splash Screen Click JupyterLab Menu [Arguments] ${menu_label} [Documentation] Click a top-level JupyterLab Menu bar, e.g. File, Help, etc. - ${xpath} = Set Variable ${JLAB XP TOP}${JLAB XP MENU LABEL}[text() = '${menu_label}'] + ${xpath} = Catenate SEPARATOR=${EMPTY} + ... ${JLAB XP TOP} + ... ${JLAB XP MENU LABEL} + ... [text() = '${menu_label}'] Wait Until Page Contains Element ${xpath} Mouse Over ${xpath} Click Element ${xpath} @@ -29,7 +32,9 @@ Click JupyterLab Menu Click JupyterLab Menu Item [Arguments] ${item_label} [Documentation] Click a top-level JupyterLab Menu Item (not File, Help, etc.) - ${item} = Set Variable ${JLAB XP MENU ITEM LABEL}[text() = '${item_label}'] + ${item} = Catenate SEPARATOR=${EMPTY} + ... ${JLAB XP MENU ITEM LABEL} + ... [text() = '${item_label}'] Wait Until Page Contains Element ${item} Mouse Over ${item} Click Element ${item} diff --git a/src/JupyterLibrary/resources/jupyterlab/Sidebar.robot b/src/JupyterLibrary/resources/jupyterlab/Sidebar.robot index 453dedb8..0062549e 100644 --- a/src/JupyterLibrary/resources/jupyterlab/Sidebar.robot +++ b/src/JupyterLibrary/resources/jupyterlab/Sidebar.robot @@ -13,4 +13,5 @@ Maybe Open JupyterLab Sidebar [Arguments] ${data id} [Documentation] Attempt to open a JupyterLab sidebar (if not already open) Maybe Close JupyterLab Sidebar - Click Element css:${JLAB CSS SIDEBAR TAB}[data-id="${data id}"] + ${sel} = Catenate SEPARATOR=${EMPTY} ${JLAB CSS SIDEBAR TAB} [data-id="${data id}"] + Click Element css:${sel}