Merge pull request #112 from martinRenou/jupyterliteb18

martinRenou · web-flow · commit 949da11f2c68 · 2023-02-15T16:29:36.000+01:00
Update jupyterlite and empack
diff --git a/docs/build-environment.yml b/docs/build-environment.yml
@@ -11,8 +11,8 @@ dependencies:
   - pydata-sphinx-theme
   - yarn
   - jupyterlab
-  - empack >=2.0.8,<3
+  - empack >=2.0.9,<3
   - pip:
-    - jupyterlite==0.1.0b17
+    - jupyterlite==0.1.0b18
     - jupyterlite-sphinx
     - ..
diff --git a/docs/conf.py b/docs/conf.py
@@ -16,3 +16,10 @@
 html_theme = "pydata_sphinx_theme"
 
 jupyterlite_dir = "."
+
+html_theme_options = {
+   "logo": {
+      "image_light": "xeus-python.svg",
+      "image_dark": "xeus-python.svg",
+   }
+}
diff --git a/docs/xeus-python.svg b/docs/xeus-python.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Calque_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 152.28207 76.377192"
+   width="453.22046"
+   height="227.31306"
+   xml:space="preserve"
+   sodipodi:docname="xeus-python.svg"
+   inkscape:version="0.92.3 (unknown)"
+   inkscape:export-filename="/home/martin/github/martinRenou/design/Libraries/xeus-python.svg.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"><metadata
+   id="metadata19"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs17">
+	
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1020"
+   inkscape:window-height="1098"
+   id="namedview15"
+   showgrid="false"
+   inkscape:zoom="0.74420323"
+   inkscape:cx="516.55892"
+   inkscape:cy="-36.351785"
+   inkscape:window-x="1024"
+   inkscape:window-y="22"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Calque_1"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#666666;}
+	.st1{fill:#7FD787;}
+	.st2{opacity:0.28;fill:#7FD787;enable-background:new    ;}
+</style>
+<path
+   style="fill:#666666"
+   inkscape:connector-curvature="0"
+   id="path4"
+   d="m 91.282072,57.388969 v 0 c -1.7,0 -3.2,0.3 -4.3,1 -0.5,0.3 -0.9,0.6 -1.3,1 v 15.7 l 2,0.7 v -7.1 c 1.2,0.8 2.4,1.1 3.6,1.1 1.5,0 2.7,-0.7 3.6,-1.9 0.8,-1.1 1.2,-2.5 1.2,-4.1 v 0 c 0,-1.9 -0.4,-3.4 -1.2,-4.6 -0.8,-1.2 -2,-1.8 -3.6,-1.8 z m -0.4,11.1 c -0.9,0.1 -2,-0.3 -3.2,-1 v -7.8 c 0.2,-0.2 0.599999,-0.4 1.099999,-0.6 0.700001,-0.3 1.400001,-0.4 2.200001,-0.4 1.9,0.1 2.8,1.8 2.8,5 0,3.1 -1.000001,4.7 -2.9,4.8 z m 15.399998,-10.8 h 2 v 10.8 c 0,2.2 -0.2,3.8 -0.7,4.6 -0.4,0.9 -1.3,1.5 -2.6,2 -1,0.4 -2.1,0.6 -3.3,0.7 l -0.3,-1.3 c 1.2,-0.2 2,-0.3 2.5,-0.5 1,-0.3 1.6,-0.8 2,-1.5 0.3,-0.5 0.4,-1.6 0.4,-3.1 v -0.5 c -1.4,0.6 -2.8,0.9 -4.3,0.9 -1,0 -1.8,-0.3 -2.599996,-0.9 -0.8,-0.7 -1.3,-1.5 -1.3,-2.6 v -8.2 l 1.999996,-0.7 v 8.3 c 0,0.9 0.3,1.6 0.9,2.1 0.6,0.5 1.3,0.7 2.2,0.7 0.9,0 1.9,-0.4 2.9,-1.1 v -9.7 z m 7.5,0 h 2.2 v 1.3 h -2.2 v 7.8 c 0,0.7 0.2,1.3 0.6,1.6 0.3,0.3 0.9,0.4 1.6,0.4 v 1 c -0.2,0 -0.5,0 -0.7,0 -1.1,0 -2,-0.3 -2.6,-0.8 -0.6,-0.5 -0.9,-1.3 -0.9,-2.2 v -7.8 h -1.4 v -1.3 h 1.4 v -3.3 l 2,-0.7 z m 13.3,1 c 0.7,0.7 1,1.6 1,2.6 v 8.3 h -2 v -7.7 c 0,-0.8 -0.2,-1.5 -0.5,-2 -0.4,-0.6 -1,-1 -1.8,-1 -0.9,0 -2.1,0.5 -3.4,1.4 v 9.2 h -2 v -18.2 l 2,-0.6 v 8.4 c 1.3,-0.9 2.7,-1.4 4.2,-1.4 1,-0.1 1.8,0.3 2.5,1 z m 8.3,-1.3 c -1.7,0 -3,0.6 -4,1.8 -1,1.1 -1.4,2.6 -1.4,4.2 0,1.8 0.4,3.3 1.3,4.4 1,1.3 2.3,2 4.1,2 1.8,0 3.1,-0.7 4.1,-2 0.9,-1.2 1.4,-2.7 1.4,-4.4 0,-1.7 -0.5,-3.1 -1.4,-4.2 -1.1,-1.2 -2.5,-1.8 -4.1,-1.8 z m 0,11.2 c -1.2,0 -2,-0.6 -2.6,-1.7 -0.5,-0.9 -0.7,-2.1 -0.7,-3.4 0,-3 1.1,-4.6 3.3,-4.7 1.2,0.1 2.1,0.6 2.6,1.6 0.5,0.8 0.7,1.8 0.7,3.1 0,3.4 -1.1,5.1 -3.3,5.1 z m 16.9,-8.1 v 9.1 h -2 v -8.1 c 0,-0.9 -0.3,-1.6 -0.8,-2.1 -0.5,-0.5 -1.3,-0.7 -2.1,-0.7 -0.9,0 -1.8,0.3 -2.7,0.9 v 10 h -2 v -10.2 c 1.1,-0.8 2.2,-1.4 3.2,-1.6 0.9,-0.2 1.7,-0.4 2.4,-0.4 0.5,0 0.9,0 1.3,0.1 0.8,0.2 1.4,0.5 1.9,1 0.5,0.6 0.8,1.2 0.8,2 z m -89.099998,2.9 h 6 c 1.7,0 3,-1.4 3,-3 v -5.7 c 0,-1.6 -1.4,-2.8 -3,-3.1 -1,-0.2 -2.1,-0.2 -3.1,-0.2 -1,0 -2,0.1 -2.9,0.2 -2.5,0.4 -3,1.4 -3,3.1 v 2.3 h 6 v 0.8 h -6 -2.2 c -1.7,0 -3.3,1 -3.7,3 -0.6,2.3 -0.6,3.7 0,6.1 0.4,1.8 1.4,3 3.2,3 h 2.1 v -2.7 c -0.2,-2 1.6,-3.8 3.6,-3.8 z m -0.4,-7.9 c -0.6,0 -1.1,-0.5 -1.1,-1.1 0,-0.6 0.5,-1.1 1.1,-1.1 0.6,0 1.1,0.5 1.1,1.1 0,0.5 -0.5,1.1 -1.1,1.1 z m 12.4,2.2 h -2.2 v 2.7 c 0,2.1 -1.7,3.8 -3.7,3.8 h -6 c -1.6,0 -3,1.4 -3,3 v 5.7 c 0,1.6 1.4,2.6 3,3 1.9,0.6 3.7,0.7 6,0 1.5,-0.4 3,-1.3 3,-3 v -2.3 h -6 v -0.8 h 6 3 c 1.7,0 2.4,-1.2 3,-3 0.6,-1.9 0.6,-3.7 0,-6.1 -0.6,-1.7 -1.4,-3 -3.1,-3 z m -5.7,14.5 c 0.6,0 1.1,0.5 1.1,1.1 0,0.6 -0.5,1.1 -1.1,1.1 -0.6,0 -1.1,-0.5 -1.1,-1.1 0,-0.6 0.5,-1.1 1.1,-1.1 z"
+   class="st0" />
+<style
+   id="style25"
+   type="text/css">
+	.st0{fill:#40B3C3;}
+	.st1{opacity:0.28;fill:#40B3C3;}
+</style><g
+   id="g31"
+   transform="scale(1.0792291)">
+	<path
+   d="m 5,0 c 0.1,0 0.3,0.1 0.4,0.1 2.5,0.8 4.5,2 4.6,2.1 1.9,1.3 3.6,3.1 4.8,5.1 0.4,0.6 5.2,7.8 8.6,12.9 -0.8,1.2 -1.5,2.3 -2.1,3.1 0,-0.1 -0.1,-0.1 -0.1,-0.2 C 17.6,17.9 11.4,8.6 11,7.9 10.1,6.6 9,5.4 7.5,4.5 7.5,4.5 6,3.5 4,2.9 3.2,2.6 1.8,2.4 0,2.2 V 44.6 C 1.8,44.4 3.2,44.2 4,43.9 6,43.3 7.5,42.3 7.5,42.3 9,41.3 10.2,40.1 11,38.9 11.4,38.2 17.6,29 21.1,23.7 24,19.1 31.4,8.1 31.9,7.3 c 1.2,-2 2.9,-3.8 4.8,-5.1 0,-0.1 2.1,-1.3 4.6,-2.1 L 41.8,0 Z m 41.7,2.2 c -1.8,0.2 -3.2,0.4 -4,0.7 -2.1,0.6 -3.6,1.6 -3.6,1.6 -1.5,0.9 -2.6,2.1 -3.5,3.4 -0.4,0.7 -6.6,9.9 -10.1,15.2 -2.9,4.4 -10.3,15.5 -10.8,16.2 -1.2,2 -2.9,3.8 -4.8,5.1 0,0.1 -2.1,1.3 -4.6,2.1 l -0.5,0.1 h 36.8 l -0.4,-0.1 c -2.5,-0.8 -4.5,-2 -4.6,-2.1 -1.9,-1.3 -3.6,-3.1 -4.8,-5.1 -0.4,-0.6 -5.2,-7.8 -8.6,-12.9 0.8,-1.2 1.5,-2.3 2.1,-3.1 0,0.1 0.1,0.1 0.1,0.2 3.5,5.3 9.7,14.5 10.1,15.2 0.9,1.3 2,2.5 3.5,3.4 0,0 1.5,1 3.5,1.6 0.8,0.3 2.2,0.5 4,0.7 v 2.1 h 0.1 V 2.2 Z"
+   class="st0"
+   id="path4143_3_"
+   inkscape:connector-curvature="0"
+   style="fill:#40b3c3" />
+	<path
+   d="m 25.4,23.3 c -0.6,0.8 -1.3,1.9 -2.1,3.1 3.4,5.1 8.1,12.3 8.6,12.9 1.2,2 2.9,3.8 4.8,5.1 0,0.1 2.1,1.3 4.6,2.1 0.2,0 0.4,0.1 0.5,0.1 h 4.8 V 44.4 C 44.8,44.2 43.4,44 42.6,43.7 40.6,43.1 39.1,42.1 39.1,42.1 37.6,41.2 36.5,40 35.6,38.7 35.2,38 29,28.8 25.5,23.5 v 0 c 0,0 0,-0.1 -0.1,-0.2 M 4.8,0 H 0 v 2.2 c 1.8,0.2 3.2,0.4 4,0.7 2,0.6 3.5,1.6 3.5,1.6 1.5,0.9 2.6,2.1 3.5,3.4 0.4,0.7 6.6,9.9 10.1,15.2 v 0 c 0,0.1 0.1,0.1 0.1,0.2 0.6,-0.8 1.3,-1.9 2.1,-3.1 C 19.9,15.1 15.2,7.9 14.7,7.3 13.5,5.3 11.8,3.5 9.9,2.2 9.9,2.1 7.8,0.9 5.3,0.1 5.2,0.1 5,0 4.8,0"
+   class="st1"
+   id="path7-3_4_"
+   inkscape:connector-curvature="0"
+   style="opacity:0.28000004;fill:#40b3c3" />
+	<path
+   id="path29"
+   d="m 140.6,31.9 c 0,6.3 -4.5,8.5 -9.6,8.5 -3.9,0 -7.6,-0.8 -10.5,-2.7 l 1,-1.9 c 2.6,1.6 5.9,2.6 9.4,2.6 3.9,0 7.4,-1.6 7.4,-6.5 0,-4.1 -3.7,-5 -8.1,-6.2 -4.7,-1.3 -8.7,-3 -8.7,-8.5 0,-5.5 4.4,-7.7 9.2,-7.7 2.7,0 5.5,0.3 8.1,1.6 l -0.9,2 c -2.2,-1.1 -4.6,-1.5 -7.2,-1.5 -3.9,0 -7,1.3 -7,5.7 0,3.8 2.7,5 7.4,6.3 5.2,1.4 9.5,2.6 9.5,8.3 z m -32.1,-6.1 c 0,7.3 -1.1,12.5 -8,12.5 h -0.6 c -6.9,0 -8,-5.1 -8,-12.5 V 9.4 c -0.8,0.4 -1.7,0.9 -2.4,1.5 v 15.6 c 0,6.5 1.2,13.9 10,13.9 h 1.3 c 8.7,0 10,-7.4 10.1,-14 V 10.8 c -0.7,-0.6 -1.5,-1.1 -2.4,-1.5 z M 80.7,24.9 v 0.8 0 H 59.9 v 1.2 c 0.4,9.5 4.6,11.5 10,11.5 3.3,0 5.9,-0.6 8.7,-2.2 l 0.9,2 c -2.8,1.7 -6,2.3 -9.6,2.3 C 63.1,40.5 57.6,37.7 57.6,25 57.6,11.4 64,9.4 69.4,9.4 c 7,-0.1 11.3,3.8 11.3,15.5 z m -2.4,-1.4 c 0,-9.2 -3.6,-12 -9,-12 -4.9,0 -9.3,1.9 -9.5,12 z"
+   class="st0"
+   inkscape:connector-curvature="0"
+   style="fill:#40b3c3" />
+</g></svg>
diff --git a/environment.yml b/environment.yml
@@ -10,6 +10,6 @@ dependencies:
   - typer
   - pytest
   - emsdk >=3.1.11
-  - empack >=2.0.8,<3
+  - empack >=2.0.9,<3
   - pip:
     - jupyterlite
diff --git a/package.json b/package.json
@@ -51,8 +51,8 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyterlite/contents": "^0.1.0-beta.16",
-    "@jupyterlite/server": "^0.1.0-beta.16",
+    "@jupyterlite/contents": "^0.1.0-beta.18",
+    "@jupyterlite/server": "^0.1.0-beta.18",
     "comlink": "^4.3.1"
   },
   "devDependencies": {
@@ -88,6 +88,10 @@
       "@jupyterlite/kernel": {
         "bundled": false,
         "singleton": true
+      },
+      "@jupyterlite/contents": {
+        "bundled": false,
+        "singleton": true
       }
     }
   },
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=3.1", "empack>=2.0.8,<3"]
+requires = ["jupyter_packaging~=0.10,<2", "jupyterlab~=3.1", "empack>=2.0.9,<3"]
 build-backend = "jupyter_packaging.build_api"
 
 [tool.jupyter-packaging.options]
diff --git a/setup.py b/setup.py
@@ -61,7 +61,7 @@
         "traitlets",
         "jupyterlite",
         "requests",
-        "empack>=2.0.8,<3",
+        "empack>=2.0.9,<3",
         "typer",
     ],
     zip_safe=False,
diff --git a/yarn.lock b/yarn.lock
