Prepare for 2020.01.0 (#60)

datakurre · web-flow · commit a6fede6fbf51 · 2020-01-10T00:29:53.000+02:00
```
conda 4.8.1
jupyter-starters 0.2.2a0
jupytext 1.3.1
matplotlib 3.1.2
rise 5.6.0
robotkernel 1.3
```
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2018, Robots from Jupyter
+Copyright (c) 2020, Robots from Jupyter
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/anaconda-project.yml b/anaconda-project.yml
@@ -59,8 +59,8 @@ env_specs:
       - https://conda.anaconda.org/anaconda
       - https://conda.anaconda.org/conda-forge
     packages:
-      - conda >=4.7.12,<4.8
-      - conda-build >=3.18.9,<3.19
+      - conda >=4.8,<4.9.0a0
+      - conda-build >=3.18.11,<3.19.0a0
       - conda-verify
       - constructor >=3,<3.1
       - firefox >=68.0.2,<69
@@ -105,8 +105,10 @@ env_specs:
       - firefox
       - jupyter-starters
       - jupytext
+      - matplotlib
       - pyshortcuts
       - restinstance
+      - rise
       - robotframework-seleniumscreenshots
       - robotframework-seleniumtestability
       - robotkernel
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -8,7 +8,7 @@ trigger:
 pr: [master]
 
 variables:
-  ROBOTLAB_VERSION: 2019.12.0
+  ROBOTLAB_VERSION: 2020.01.0
   PYTHONUNBUFFERED: 1
 
 jobs:
diff --git a/ci/env-main.yml b/ci/env-main.yml
@@ -5,8 +5,8 @@ channels:
   - https://conda.anaconda.org/conda-forge
 
 dependencies:
-  - conda >=4.7.12,<4.8
-  - conda-build >=3.18.9,<3.19
+  - conda >=4.8,<4.9.0a0
+  - conda-build >=3.18.11,<3.19.0a0
   - conda-verify
   - constructor >=3,<3.1
   - pillow
diff --git a/ci/env-noarch.yml b/ci/env-noarch.yml
@@ -5,8 +5,8 @@ channels:
   - https://conda.anaconda.org/conda-forge
 
 dependencies:
-  - conda >=4.7.12,<4.8
-  - conda-build >=3.18.9,<3.19
+  - conda >=4.8,<4.9.0a0
+  - conda-build >=3.18.11,<3.19.0a0
   - conda-verify
   - python >=3.6,<3.7.0a0
   - python-libarchive-c
diff --git a/environment.yml b/environment.yml
@@ -5,8 +5,8 @@ channels:
   - https://conda.anaconda.org/conda-forge
 
 dependencies:
-  - conda >=4.7.12,<4.8
-  - conda-build >=3.18.9,<3.19
+  - conda >=4.8,<4.9.0a0
+  - conda-build >=3.18.11,<3.19.0a0
   - conda-verify
   - constructor >=3,<3.1
   - firefox >=68.0.2,<69
diff --git a/recipes/jupyter-starters/meta.yaml b/recipes/jupyter-starters/meta.yaml
@@ -1,13 +1,13 @@
 {% set name = "jupyter_starters" %}
-{% set version = "0.1.0a3" %}
+{% set version = "0.2.2a0" %}
 
 package:
   name: {{ name | replace("_", "-") }}
   version: {{ version }}
 
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
-  sha256: 644cf8458fa8c5fbc63da6dbc4e079c16d38c499964d3077dc8659f12c9763ad
+  sha256: 8773e03f8e05532197aa16f4a634bb3d1f8fe858658a7f20bf64879fd78e367f
 
 build:
   noarch: python
@@ -25,13 +25,6 @@ requirements:
 test:
   imports:
     - jupyter_starters
-    - jupyter_starters.handlers
-    - jupyter_starters.manager
-    - jupyter_starters.py_starters.cookiecutter
-    - jupyter_starters.schema.v1
-    - jupyter_starters.serverextension
-    - jupyter_starters.trait_types
-    - jupyter_starters.types
 
 about:
   home: https://github.com/deathbeds/jupyterlab-starters
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 = "1.2" %}{{ version }}'
+  version: '{% set version = "1.3.0" %}{{ version }}'
 
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
-  sha256: a1501892e63e87ee87a1cfb742e112c7bf529d9441110dcf78d939ec89946589
+  sha256: 8401e9bee8df473e586a1607c2b50c628dd01493ac258569f56720e345360019
 
 build:
   noarch: python
diff --git a/recipes/robotlab/builder.py b/recipes/robotlab/builder.py
@@ -15,7 +15,7 @@
 TUTORIAL = WWW / "robotkernel-tutorial"
 NOTEBOOKS = {
     EXAMPLES: KERNEL / "examples",
-    TUTORIAL: KERNEL / "docs" / "notebooks"
+    TUTORIAL: KERNEL / "src" / "robotkernel" / "resources" / "notebooks" / "tutorial"
 }
 SVG = SRC_DIR / "robotlab" / "src" / "robotlab" / "icons" / "starter.svg"
 
@@ -33,23 +33,25 @@
     for dest, src in NOTEBOOKS.items()
 ]
 
+
 print("making starters...")
 (ETC / "robotlab-starters.json").write_text(json.dumps({
     "StarterManager": {
         "extra_starters": {
-            "robotkernel-examples": {
-                "type": "copy",
-                "label": "Robotkernel Examples",
-                "description": "Examples of using robotkernel",
-                "icon": SVG.read_text().replace("jp-icon3", "jp-icon-contrast1"),
-                "src": str(EXAMPLES)
+            "robotkernel-quickstart": {
+                "label": "",
+                "description": "",
+                "type": "notebook",
+                "py_src": "robotkernel",
+                "src": "resources/starter/quickstart-starter.ipynb"
             },
             "robotkernel-tutorial": {
+                "label": "Tutorial",
+                "description": "Tutorial for Robot Framework on Jupyter",
                 "type": "copy",
-                "label": "Robotkernel Tutorial",
-                "description": "A guided tutorial through using robotkernel",
-                "icon": SVG.read_text().replace("jp-icon3", "jp-icon-contrast3"),
-                "src": str(TUTORIAL)
+                "py_src": "robotkernel",
+                "src": "resources/notebooks/tutorial",
+                "icon": SVG.read_text().replace("jp-icon3", "jp-icon-contrast3")
             }
         }
     }
diff --git a/recipes/robotlab/meta.yaml b/recipes/robotlab/meta.yaml
@@ -4,19 +4,19 @@
 {% set robot_jupyterlab = "==1.2.4" %}
 {% set robot_node = ">=11,<12" %}
 {% set robot_pywinpty = ">=0.5.5" %}
-{% set robot_starters = ">=0.1.0a2,<0.2.0a0" %}
+{% set robot_starters = ">=0.2.2a0,<0.3.0a0" %}
 {% set robot_widgets = ">=7.5.1" %}
-{% set robotkernel = "1.2" %}
+{% set robotkernel = "1.3.0" %}
 
 package:
   name: {% set name = "robotlab" %}{{ name }}
-  version: {% set version = "2019.12.0" %}{{ version }}
+  version: {% set version = "2020.01.0" %}{{ version }}
 
 source:
   - path: ../../robotlab
     folder: robotlab
   - url: https://github.com/robots-from-jupyter/robotkernel/archive/{{ robotkernel }}.tar.gz
-    sha256: 222aebe0de5025b58f4753a2198fa85dc7b432c2d3d70550ebd8095f8507391b
+    sha256: e3c384621f37c9471ca0c65c44c8203c7a99207cbb155a70c7b9063f2b9832e8
     folder: robotkernel
   # we do the jupyterlab build off-line to keep conda-build time low
   - path: ../../_artifacts/app_dir
@@ -47,13 +47,15 @@ requirements:
     - ipywidgets {{ robot_widgets }}
     - jupyter-starters {{ robot_starters }}
     - jupyterlab {{ robot_jupyterlab }}
-    - jupytext >=1.3.0
+    - jupytext >=1.3.1
+    - matplotlib >=3.1.2
     - nodejs {{ robot_node }}
     - opencv
     - pyshortcuts
     - python
     - pywinpty {{ robot_pywinpty }}  # [win]
     - restinstance
+    - rise >=5.6.0
     - robotframework =={{ robot }}
     - robotframework-jupyterlibrary
     - robotframework-seleniumscreenshots
diff --git a/robotlab/setup.cfg b/robotlab/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = robotlab
-version = 2019.12.0
+version = 2020.01.0
 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 +1 @@
-__version__ = "2019.12.0"
+__version__ = "2020.01.0"
diff --git a/scripts/__init__.py b/scripts/__init__.py
@@ -31,15 +31,15 @@
 README = ROOT / "README.md"
 
 # for easy overriding in CI
-VERSION = os.environ.get("ROBOTLAB_VERSION", "2019.12.0")
-CONDA_VERSION = os.environ.get("CONDA_VERSION", "4.7.12")
+VERSION = os.environ.get("ROBOTLAB_VERSION", "2020.01.0")
+CONDA_VERSION = os.environ.get("CONDA_VERSION", "4.8.0")
 RF_VERSION = os.environ.get("RF_VERSION", "3.1.2")
 PY_MAX = os.environ.get("PY_MAX", "3.7.0a0")
 PY_MIN = os.environ.get("PY_MIN", "3.6")
 LABEXTENSIONS = os.environ.get(
     "LABEXTENSIONS",
     """
-@deathbeds/jupyterlab-starters@0.1.0a2
+@deathbeds/jupyterlab-starters@0.2.2a0
 @jupyter-widgets/jupyterlab-manager@1.1.0
 @jupyterlab/toc@1.0.1
 jupyterlab_robotmode@2.4.0
diff --git a/tests/acceptance/RobotLab/2_Lab/30_Tutorial.robot b/tests/acceptance/RobotLab/2_Lab/30_Tutorial.robot
@@ -45,8 +45,8 @@ Open the Tutorial Notebook
     [Documentation]    Open and prepare the tutorial notebook
     Wait Until Page Contains Element    ${XP FILE TREE TUTORIAL 00}    timeout=10s
     Double Click Element    ${XP FILE TREE TUTORIAL 00}
-    Wait Until Page Contains Element    css:.jp-Notebook h2    timeout=10s
-    Wait Until Page Contains    Robot Framework | Idle    timeout=3s
+    Wait Until Page Contains Element    css:.jp-Notebook table    timeout=10s
+    Wait Until Page Contains    Python 3 | Idle    timeout=3s
     Capture Page Screenshot    ${prefix}_2_after_launch.png
     Execute JupyterLab Command    Clear All Outputs
 
@@ -60,6 +60,6 @@ Run the Tutorial Notebook
     Click Element    ${CSS NOTEBOOK SAVE}
     Execute JupyterLab Command    Run All Cells
     Wait Until Page Does Not Contain    [*]    timeout=20s
-    Wait Until Page Contains    Robot Framework | Idle    timeout=3s
+    Wait Until Page Contains    Python 3 | Idle    timeout=3s
     Click Element    ${CSS NOTEBOOK SAVE}
     Execute JupyterLab Command    Close All
diff --git a/tests/resources/Install.robot b/tests/resources/Install.robot
@@ -5,7 +5,7 @@ Library           Process
 Resource          ./Cleanup.robot
 
 *** Variables ***
-${INSTALLER VERSION}    2019.12.0
+${INSTALLER VERSION}    2020.01.0
 ${INSTALL LOG}    ${OUTPUT DIR}${/}00_installer.log
 &{GECKODRIVER}    linux=bin${/}geckodriver    darwin=bin${/}geckodriver    windows=Scripts${/}geckodriver.exe
 &{FIREFOX}        linux=bin${/}firefox    darwin=bin${/}firefox    windows=Library${/}bin${/}firefox.exe
diff --git a/tests/resources/Selectors.robot b/tests/resources/Selectors.robot
@@ -1,10 +1,10 @@
 *** Variables ***
-${XP LAUNCH SECTION}    xpath://h2[contains(@class, 'jp-Launcher-sectionTitle')][contains(text(), 'Starters')]
+${XP LAUNCH SECTION}    xpath://h2[contains(@class, 'jp-Launcher-sectionTitle')][text() = 'Starters']
 ${CSS LAUNCH CARD}    css:[data-category\="Starters"]
-${CSS LAUNCH CARD TUTORIAL}    ${CSS LAUNCH CARD}\[title\="A guided tutorial through using robotkernel"]
+${CSS LAUNCH CARD TUTORIAL}    ${CSS LAUNCH CARD}\[title\="Tutorial for Robot Framework on Jupyter"]
 ${XP FILE TREE ITEM}    xpath://span[contains(@class, 'jp-DirListing-itemText')]
-${XP FILE TREE TUTORIAL}    ${XP FILE TREE ITEM}\[contains(text(), 'robotkernel-tutorial')]
-${XP FILE TREE TUTORIAL 00}    ${XP FILE TREE ITEM}\[contains(text(), '00 JupyterLab User Interface.ipynb')]
+${XP FILE TREE TUTORIAL}    ${XP FILE TREE ITEM}\[text() = 'tutorial']
+${XP FILE TREE TUTORIAL 00}    ${XP FILE TREE ITEM}\[text() = '00 Keyboard Shortcuts.ipynb']
 ${CSS NOTEBOOK SAVE}    css:[data-icon="save"]
 ${JP STATUS BAR}    id:jp-bottom-panel
 ${CRUMBS HOME}    css:.jp-BreadCrumbs-home
