Merge pull request #144 from robots-from-jupyter/rf61

Add support for RF61 [fixes #143]
robots-from-jupyter · Jul 23, 2023 · 80c95ec · 80c95ec
2 parents 13e02f3 + f331b51
commit 80c95ec
Show file tree

Hide file tree

Showing 13 changed files with 3,243 additions and 25 deletions.
diff --git a/.github/workflows/smoketest.yml b/.github/workflows/smoketest.yml
@@ -7,13 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        robotframework-version: [rf32, rf40, rf41, rf50, rf51, rf60]
+        robotframework-version: [rf32, rf40, rf41, rf50, rf51, rf60, rf61]
     steps:
     - uses: actions/[email protected]
-    - uses: cachix/install-nix-action@v16
+    - uses: cachix/install-nix-action@v22
       with:
         nix_path: nixpkgs=channel:nixos-unstable
-    - uses: cachix/cachix-action@v10
+    - uses: cachix/cachix-action@v12
       with:
         name: robots-from-jupyter
         # If you chose signing key for write access

diff --git a/Makefile b/Makefile
@@ -63,6 +63,7 @@ requirements-all:
 	ROBOTFRAMEWORK=rf50 make requirements
 	ROBOTFRAMEWORK=rf51 make requirements
 	ROBOTFRAMEWORK=rf60 make requirements
+	ROBOTFRAMEWORK=rf61 make requirements
 
 requirements: requirements-$(PYTHON)-$(ROBOTFRAMEWORK).nix
 

diff --git a/binder/environment.yml b/binder/environment.yml
@@ -17,11 +17,11 @@ dependencies:
     - requests==2.22.0
     - RESTinstance==1.0.2
     - rise==5.6.1
-    - robotframework==5.0
+    - robotframework==6.1
     - robotframework-faker==5.0.0
-    - robotframework-seleniumlibrary==5.1.3
+    - robotframework-seleniumlibrary==6.1.0
     - robotframework-seleniumscreenshots==0.9.5
-    - selenium==3.141.0
+    - selenium==4.4.3
     - urllib3==1.25.3
     - jupyter-starters==1.1.0
     - jupyterlab-widgets==1.0.2

diff --git a/docs/environment.yml b/docs/environment.yml
@@ -12,7 +12,6 @@ dependencies:
   # pretties
   - ipylab
   - ipywidgets
-  - jupyterlab-fonts
   - jupyter-videochat
   - jupyterlab-webrtc-docprovider
   - wxyz_lab
@@ -23,7 +22,7 @@ dependencies:
   - nodejs >=14,<15
   - setuptools_scm >=6.2
   # I'm still afraid of jlpm
-  - yarn
+  - yarn==1.22.19
   - pip:
     # lite deps
     - jupyterlite[all] ==0.1.0b7

diff --git a/dodo.py b/dodo.py
@@ -199,7 +199,7 @@ def _clean_wheels():
             ),
             # Not sure, why these were not discovered from conda environment
             doit.tools.CmdAction(
-                [PY, "-m", "pip", "wheel", "--no-deps", "--prefer-binary", "jupyterlab-widgets==1.1.0", "jupyter-videochat", "jupyterlab-drawio", "jupyterlab-webrtc-docprovider"],
+                [PY, "-m", "pip", "wheel", "--no-deps", "--prefer-binary", "jupyterlab-drawio"],
                 cwd=str(LITE),
                 shell=False,
             ),
@@ -216,21 +216,31 @@ def _build():
                 "lite",
                 "build",
                 "--debug",
-                "--LiteBuildConfig.federated_extensions",
-                f"{list(LITE.glob('jupyterlab_webrtc_docprovider*'))[-1]}",
-                "--LiteBuildConfig.federated_extensions",
-                f"{list(LITE.glob('jupyter_videochat*'))[-1]}",
-                "--LiteBuildConfig.federated_extensions",
-                f"{list(LITE.glob('jupyterlab_widgets*'))[-1]}",
+                "--contents",
+                str(LITE / "contents"),
                 "--LiteBuildConfig.federated_extensions",
                 f"{list(LITE.glob('jupyterlab_drawio*'))[-1]}",
                 "--LiteBuildConfig.federated_extensions",
-                f"{list(LITE.glob('jupyterlab_robotmode*'))[-1]}",
-                "--LiteBuildConfig.federated_extensions",
                 EXT_WHL,
             ],
             cwd=str(LITE)
         )
+        subprocess.check_call(
+            [
+                "mkdir",
+                "-p",
+                "_",
+            ],
+            cwd=str(LITE)
+        )
+        subprocess.check_call(
+            [
+                "mv",
+                "_output",
+                "_/_",
+            ],
+            cwd=str(LITE)
+        )
 
     yield dict(
         name="build",