Merge pull request #29 from robots-from-jupyter/robotkernel-1.0rc1

datakurre · web-flow · commit a3a0128f7b9a · 2019-04-02T06:42:01.000+03:00
Prepare for release 1.0rc1
diff --git a/constructor/post_install.bat b/constructor/post_install.bat
@@ -1,2 +1,3 @@
 "%PREFIX%\Scripts\activate.bat" "%PREFIX%"
 robotlab-shortcuts
+pip install robotframework-whitelibrary
diff --git a/recipes/robotkernel/meta.yaml b/recipes/robotkernel/meta.yaml
@@ -1,10 +1,10 @@
 package:
   name: {% set name = "robotkernel" %}{{ name }}
-  version: {% set version = "0.10.2" %}{{ version }}
+  version: {% set version = "1.0rc1" %}{{ version }}
 
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
-  sha256: 93560cb763d5efe3785e920aa59b2f2f2048ea84bda9f4a6868340143a9f4028
+  sha256: 7914dbb25efb70b2392f6864c554b057936826f8341868d6ece88f3bc3094e27
 
 build:
   number: 0
diff --git a/recipes/robotlab/meta.yaml b/recipes/robotlab/meta.yaml
@@ -1,16 +1,16 @@
-{% set extensions = "@jupyterlab/toc@0.6.0 @jupyter-widgets/jupyterlab-manager@0.38.1 jupyterlab_robotmode@1.1.1" %}
+{% set extensions = "@jupyterlab/toc@0.6.0 @jupyter-widgets/jupyterlab-manager@0.38.1 jupyterlab_robotmode@2.3.1" %}
 {% set lab_min = "0.35.4" %}
 {% set lab_max = "0.36" %}
 
 package:
   name: {% set name = "robotlab" %}{{ name }}
-  version: {% set version = "0.10.2" %}{{ version }}
+  version: {% set version = "1.0rc1" %}{{ version }}
 
 source:
   - path: ../../robotlab
     folder: robotlab
   - url: https://github.com/robots-from-jupyter/robotkernel/archive/{{ version }}.tar.gz
-    sha256: e30b75e043f8fcb8a2072d6b1a506a1de7d69f7f8136886f222ba56e618d0da0
+    sha256: 5eed6419990ca3e1962528d0b37b9d8898020b752bd0646baea5db86f107893e
     folder: robotkernel
 
 build:
@@ -37,7 +37,7 @@ build:
     - copy *.ipynb {{ PREFIX }}\var\www\robotkernel-examples  # [win]
     - cd ..
     - cd docs
-    - cd tutorial
+    - cd notebooks
     - mkdir -p {{ PREFIX }}/var/www/robotkernel-tutorial  # [unix]
     - cp *.ipynb {{ PREFIX }}/var/www/robotkernel-tutorial  # [unix]
     - md {{ PREFIX }}\var\www\robotkernel-tutorial  # [win]
diff --git a/robotlab/setup.cfg b/robotlab/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = robotlab
-version = 0.10.2
+version = 1.0rc1
 description = A pre-configured JupyterLab for demonstrating robotkernel
 long_description = file: README.md
 url = https://github.com/robots-from-jupyter/robotlab
diff --git a/robotlab/src/robotlab/_version.py b/robotlab/src/robotlab/_version.py
@@ -1,2 +1,2 @@
 # Not strictly meaningful: currently tied to robotkernel version
-__version__ = "0.10.2"
+__version__ = "1.0rc1"
diff --git a/robotlab/src/robotlab/launch.py b/robotlab/src/robotlab/launch.py
@@ -13,19 +13,22 @@
 
 from robotlab import WIN, BIN_DIR, SCRIPT_EXT
 
+BAT_ACTIVATE = [
+    f'call "{BIN_DIR}\\activate"  "{sys.prefix}"  || activate "{sys.prefix}"'
+]
 
-ACTIVATE = [
-    f'''call "{BIN_DIR}\\activate"  "{sys.prefix}"  || activate "{sys.prefix}"'''
-] if WIN else [
+SH_ACTIVATE = [
     "#!" + "/usr/bin/env bash",
-    f'''. "{BIN_DIR}/activate" "{sys.prefix}" || . activate "{sys.prefix}"'''
+    f'. "{BIN_DIR}/activate" "{sys.prefix}" || . activate "{sys.prefix}"',
 ]
 
-CMD = [
-    "call python -m robotlab.labapp"
-] if WIN else [
-    "python -m robotlab.labapp"
-]
+ACTIVATE = BAT_ACTIVATE if WIN else SH_ACTIVATE
+
+BAT_CMD = ["call python -m robotlab.labapp"]
+
+SH_CMD = ["python -m robotlab.labapp"]
+
+CMD = BAT_CMD if WIN else SH_CMD
 
 
 def launch_robotlab():
@@ -36,10 +39,7 @@ def launch_robotlab():
         script.write_text(os.linesep.join(lines))
         script.chmod(0o755)
         print(script.read_text(), "\n")
-        proc = subprocess.Popen(
-            [str(script)],
-            cwd=os.path.expanduser("~")
-        )
+        proc = subprocess.Popen([str(script)], cwd=os.path.expanduser("~"))
         try:
             proc.wait()
         except KeyboardInterrupt:
diff --git a/robotlab/src/robotlab/shortcuts.py b/robotlab/src/robotlab/shortcuts.py
@@ -10,7 +10,7 @@ def make_shortcuts():
         name="RobotLab",
         terminal=True,
         description="Launch RobotLab in your $HOME",
-        icon=str(HERE / "icons" / f"lab.{ICON_EXT}")
+        icon=str(HERE / "icons" / f"lab.{ICON_EXT}"),
     )
 
 
diff --git a/scripts/__init__.py b/scripts/__init__.py
@@ -37,7 +37,7 @@
 NODE_MIN = os.environ.get("NODE_MIN", "8")
 NODE_MAX = os.environ.get("NODE_MAX", "9")
 RF_VERSION = os.environ.get("ROBOTFRAMEWORK_VERSION", "3.1.1")
-VERSION = os.environ.get("ROBOTLAB_VERSION", "0.10.2")
+VERSION = os.environ.get("ROBOTLAB_VERSION", "1.0rc1")
 CHROMEDRIVER_VERSION = os.environ.get("CHROMEDRIVER_VERSION", "2.45")
 IPYWIDGETS_VERSION = os.environ.get("CHROMEDRIVER_VERSION", "7.4.2")
 
diff --git a/scripts/integrity.py b/scripts/integrity.py
@@ -3,20 +3,20 @@
 from . import ROOT, RECIPE_DIR, ROBOTLAB_DIR, SCRIPTS_DIR, TEST_DIR
 
 
-META_PATTERN = r""" set version = "([\d\.]+)" """
+META_PATTERN = r""" set version = "([\d\.rc]+)" """
 
 VERSIONS = {
     RECIPE_DIR / "robotkernel" / "meta.yaml": META_PATTERN,
     RECIPE_DIR / "robotlab" / "meta.yaml": META_PATTERN,
-    ROBOTLAB_DIR / "setup.cfg": r"version = ([\d\.]+)",
+    ROBOTLAB_DIR / "setup.cfg": r"version = ([\d\.rc]+)",
     ROBOTLAB_DIR
     / "src"
     / "robotlab"
-    / "_version.py": r"""__version__ = "([\d\.]+)""",
-    SCRIPTS_DIR / "__init__.py": r"""ROBOTLAB_VERSION", "([\d\.]+)""",
+    / "_version.py": r"""__version__ = "([\d\.rc]+)""",
+    SCRIPTS_DIR / "__init__.py": r"""ROBOTLAB_VERSION", "([\d\.rc]+)""",
     TEST_DIR
     / "resources"
-    / "Install.robot": r"\$\{INSTALLER VERSION\}\s+([\d\.]+)",
+    / "Install.robot": r"\$\{INSTALLER VERSION\}\s+([\d\.rc]+)",
 }
 
 
diff --git a/tests/acceptance/CLI/00_nbrobot.robot b/tests/acceptance/CLI/00_nbrobot.robot
@@ -17,5 +17,5 @@ Can I get help on nbrobot?
 Run nbrobot
     [Arguments]    ${args}    ${log}
     [Documentation]    Run nbrobot and write the output to a log file
-    ${proc} =    Run Process    ${ACTIVATE} && nbrobot ${args}    shell=True    stdout=${log}    stderr=STDOUT
+    ${proc} =    Run Process    ${ACTIVATE} && nbrobot ${args}    shell=True    stdout=${log}    stderr=STDOUT    env:PS1=[:|]
     [Return]    ${proc}
diff --git a/tests/acceptance/RobotLab/00_Smoke_Test.robot b/tests/acceptance/RobotLab/00_Smoke_Test.robot
@@ -15,6 +15,7 @@ Does RobotLab Load?
     [Arguments]    ${browser}
     [Documentation]    Does the Lab launcher show up with a Robot Framework entry?
     Set Tags    browser:${browser}
-    Open JupyterLab    browser=${browser}
+    Wait until keyword succeeds    3 x    1 s
+    ...  Open JupyterLab    browser=${browser}
     Page Should Contain    Robot Framework
     Capture Page Screenshot    ${browser}_smoke__00_smoke_test.png
diff --git a/tests/acceptance/RobotLab/01_IPython_Notebook.robot b/tests/acceptance/RobotLab/01_IPython_Notebook.robot
@@ -17,12 +17,15 @@ Can RobotLab make an IPython Notebook?
     Set Tags    browser:${browser}
     ${prefix} =    Set Variable    ipython_${browser}_
     Open JupyterLab    browser=${browser}
+    Execute JupyterLab Command  Close All
     Launch a new JupyterLab Document    Python 3    Notebook
     Capture Page Screenshot    ${prefix}_01_notebook.png
     Add and Run JupyterLab Code Cell    print("Hello" + " World")
     Capture Page Screenshot    ${prefix}_02_execute.png
+    Sleep    2s
     Wait Until JupyterLab Kernel Is Idle
     Capture Page Screenshot    ${prefix}_03_execute_result.png
     Page Should Contain    Hello World
     Execute JupyterLab Command    Save Notebook
+    Sleep    2s
     Capture Page Screenshot    ${prefix}_09_save.png
diff --git a/tests/acceptance/RobotLab/02_Robot_Notebook.robot b/tests/acceptance/RobotLab/02_Robot_Notebook.robot
@@ -17,15 +17,18 @@ Can RobotLab make a Robot Notebook?
     Set Tags    browser:${browser}
     ${prefix} =    Set Variable    robot_${browser}_
     Open JupyterLab    browser=${browser}
+    Execute JupyterLab Command  Close All
     Launch a new JupyterLab Document    Robot Framework    Notebook
     Capture Page Screenshot    ${prefix}_01_notebook.png
     Add and Run JupyterLab Code Cell    | *Test Case* |${\n}| Hello |${\n}| | Log | Hello World
     Capture Page Screenshot    ${prefix}_02_execute.png
+    Sleep    3s
     Wait Until JupyterLab Kernel Is Idle
     Capture Page Screenshot    ${prefix}_03_execute_result.png
     The Robot Popup Should Contain    ${prefix}    Log    1 passed, 0 failed
     The Robot Popup Should Contain    ${prefix}    Report    All tests passed
     Execute JupyterLab Command    Save Notebook
+    Sleep    2s
     Capture Page Screenshot    ${prefix}_09_save.png
 
 The Robot Popup Should Contain
diff --git a/tests/acceptance/_Smoke.robot b/tests/acceptance/_Smoke.robot
@@ -6,7 +6,5 @@ Library           OperatingSystem
 *** Test Cases ***
 Are there shortcuts?
     [Documentation]    Verify the robotlab shortcuts were created during install
-    Variable Should Exist    ${ROBOTLAB SHORTCUT}
-    ...   msg=Should have defined shortcut during install
-    File Should Exist    ${FAKE HOME}${/}Desktop${/}${ROBOTLAB SHORTCUT}
-    ...   msg=Should have created shortcut during install
+    Variable Should Exist    ${ROBOTLAB SHORTCUT}    msg=Should have defined shortcut during install
+    File Should Exist    ${FAKE HOME}${/}Desktop${/}${ROBOTLAB SHORTCUT}    msg=Should have created shortcut during install
diff --git a/tests/resources/Install.robot b/tests/resources/Install.robot
@@ -5,7 +5,7 @@ Library           Process
 Library           JupyterLibrary
 
 *** Variables ***
-${INSTALLER VERSION}    0.10.2
+${INSTALLER VERSION}    1.0rc1
 ${INSTALLER DIR}    ${OUTPUT DIR}${/}..${/}constructor
 ${INSTALL LOG}    ${OUTPUT DIR}${/}${OS}${/}00_installer.log
 
@@ -24,7 +24,7 @@ Run the RobotLab installer
     ${path} =    Evaluate    __import__("tempfile").mkdtemp("RobotLab")
     Create Directory    ${OUTPUT DIR}${/}${OS}
     Set Global Variable    ${ROBOTLAB DIR}    ${path}${/}robotlab
-    Set Global Variable    ${FAKE HOME}  ${path}${/}home
+    Set Global Variable    ${FAKE HOME}    ${path}${/}home
     Create Directory    ${FAKE HOME}${/}Desktop
     ${result} =    Run Keyword If    "${OS}" == "linux"    Run the RobotLab Linux installer
     ...    ELSE IF    "${OS}" == "windows"    Run the RobotLab Windows Installer
@@ -36,9 +36,9 @@ Run the RobotLab installer
 Run the RobotLab Linux installer
     [Documentation]    Install RobotLab on Linux
     ${result} =    Run Process    bash    ${INSTALLER DIR}${/}RobotLab-${INSTALLER VERSION}-Linux-x86_64.sh    -fbp    ${ROBOTLAB DIR}    stdout=${INSTALL LOG}
-    ...    stderr=STDOUT   env:HOME=${FAKE HOME}
+    ...    stderr=STDOUT    env:HOME=${FAKE HOME}
     Set Global Variable    ${ACTIVATE SCRIPT}    ${ROBOTLAB DIR}${/}bin${/}activate
-    Set Global Variable    ${ACTIVATE}    set -eux && . "${ACTIVATE SCRIPT}" "${ROBOTLAB DIR}"
+    Set Global Variable    ${ACTIVATE}    set -ex && . "${ACTIVATE SCRIPT}" "${ROBOTLAB DIR}"
     Set Global Variable    ${ROBOTLAB PATH ENV}    ${ROBOTLAB DIR}${/}bin:%{PATH}
     Set Global Variable    ${ROBOTLAB CMD}    ${ROBOTLAB DIR}${/}bin${/}robotlab
     Set Global Variable    ${ROBOTLAB SHORTCUT}    RobotLab.desktop
@@ -47,9 +47,9 @@ Run the RobotLab Linux installer
 Run the RobotLab OSX installer
     [Documentation]    Install RobotLab on OSX
     ${result} =    Run Process    bash    ${INSTALLER DIR}${/}RobotLab-${INSTALLER VERSION}-MacOSX-x86_64.sh    -fbp    ${ROBOTLAB DIR}    stdout=${INSTALL LOG}
-    ...    stderr=STDOUT   env:HOME=${FAKE HOME}
+    ...    stderr=STDOUT    env:HOME=${FAKE HOME}
     Set Global Variable    ${ACTIVATE SCRIPT}    ${ROBOTLAB DIR}${/}bin${/}activate
-    Set Global Variable    ${ACTIVATE}    set -eux && . "${ACTIVATE SCRIPT}" "${ROBOTLAB DIR}"
+    Set Global Variable    ${ACTIVATE}    set -ex && . "${ACTIVATE SCRIPT}" "${ROBOTLAB DIR}"
     Set Global Variable    ${ROBOTLAB PATH ENV}    ${ROBOTLAB DIR}${/}bin${:}%{PATH}
     Set Global Variable    ${ROBOTLAB CMD}    ${ROBOTLAB DIR}${/}bin${/}robotlab
     Set Global Variable    ${ROBOTLAB SHORTCUT}    RobotLab.app

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`"%PREFIX%\Scripts\activate.bat" "%PREFIX%"`
`2`	`2`	`robotlab-shortcuts`
	`3`	`+pip install robotframework-whitelibrary`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`# Not strictly meaningful: currently tied to robotkernel version`
`2`		`-__version__ = "0.10.2"`
	`2`	`+__version__ = "1.0rc1"`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ def make_shortcuts():`
`10`	`10`	`name="RobotLab",`
`11`	`11`	`terminal=True,`
`12`	`12`	`description="Launch RobotLab in your $HOME",`
`13`		`- icon=str(HERE / "icons" / f"lab.{ICON_EXT}")`
	`13`	`+ icon=str(HERE / "icons" / f"lab.{ICON_EXT}"),`
`14`	`14`	`)`
`15`	`15`
`16`	`16`