Merge branch 'fix/143/windows-ci' of https://github.com/foster999/jupyter-sphinx into fix/143/windows-ci

Author: foster999

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8]
         os: [ubuntu-latest]
         include:
           - os: windows-latest

jupyter_sphinx/__init__.py

@@ -122,20 +122,20 @@ def build_finished(app, env):
     if app.builder.format != "html":
         return
 
-    module_path = Path(__file__)
-    outdir_path = Path(app.outdir)
+    module_dir = Path(__file__).parent
+    outdir = Path(app.outdir)
 
     # Copy stylesheet
-    src = module_path / "css"
-    dst = outdir_path / "_static"
+    src = module_dir / "css"
+    dst = outdir / "_static"
     copy_asset(src, dst)
 
     thebe_config = app.config.jupyter_sphinx_thebelab_config
     if not thebe_config:
         return
 
     # Copy all thebelab related assets
-    src = module_path / "thebelab"
+    src = module_dir / "thebelab"
     copy_asset(src, dst)
 
 

jupyter_sphinx/thebelab.py

@@ -98,7 +98,7 @@ def add_thebelab_library(doctree, env):
             return
 
         try:
-            thebe_config = json.load(filename.read_bytes())
+            thebe_config = json.loads(filename.read_text())
         except ValueError:
             js.logger.warning(
                 "The supplied thebelab configuration file is not in JSON format."

jupyter_sphinx/utils.py

@@ -81,7 +81,8 @@ def sphinx_abs_dir(env, *paths):
         # Can't get relative path between drives on Windows
         return out_path.as_posix()
 
-    return "/" + out_path.relative_to(env.app.srcdir).as_posix()
+    # Path().relative_to() doesn't work when not a direct subpath
+    return "/" + os.path.relpath(out_path, env.app.srcdir)
 
 
 def output_directory(env):

setup.py

@@ -34,6 +34,6 @@
         "nbconvert>=5.5",
         "nbformat",
     ],
-    python_requires=">= 3.5",
+    python_requires=">= 3.6",
     package_data={"jupyter_sphinx": ["thebelab/*", "css/*"]},
 )