🐛 BUG: fixing jupyterhub urls (#166)

executablebooks · Aug 8, 2020 · 6439b66 · 6439b66
1 parent c00e5df
commit 6439b66
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -57,8 +57,10 @@
 html_theme_options = {
     "path_to_docs": "docs",
     "repository_url": "https://github.com/executablebooks/sphinx-book-theme",
+    # "repository_branch": "gh-pages",  # For testing
     "launch_buttons": {
         "binderhub_url": "https://mybinder.org",
+        # "jupyterhub_url": "https://datahub.berkeley.edu",  # For testing
         "colab_url": "https://colab.research.google.com/",
         "notebook_interface": "jupyterlab",
         "thebe": True,

diff --git a/sphinx_book_theme/launch.py b/sphinx_book_theme/launch.py
@@ -81,7 +81,7 @@ def add_hub_urls(app, pagename, templatename, context, doctree):
     if jupyterhub_url:
         url = (
             f"{jupyterhub_url}/hub/user-redirect/git-pull?"
-            f"repo={repo_url}&urlpath={ui_pre}/{repo}/{path_rel_repo}"
+            f"repo={repo_url}&urlpath={ui_pre}/{repo}/{path_rel_repo}&branch={branch}"
         )
         context["jupyterhub_url"] = url
 

diff --git a/tests/test_build/test_repo_custombranch.html b/tests/test_build/test_repo_custombranch.html
@@ -5,7 +5,7 @@
    Binder
   </button>
  </a>
- <a class="jupyterhub-button" href="https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https://github.com/executablebooks/sphinx-book-theme&amp;urlpath=lab/tree/sphinx-book-theme/TESTPATH/section1/ntbk.ipynb">
+ <a class="jupyterhub-button" href="https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https://github.com/executablebooks/sphinx-book-theme&amp;urlpath=lab/tree/sphinx-book-theme/TESTPATH/section1/ntbk.ipynb&amp;branch=foo">
   <button class="btn btn-secondary topbarbtn" data-placement="left" data-toggle="tooltip" title="Launch JupyterHub" type="button">
    <img alt="Interact on JupyterHub" class="jupyterhub-button-logo" src="../_static/images/logo_jupyterhub.svg"/>
    JupyterHub

diff --git a/tests/test_build/test_topbar_launchbtns.html b/tests/test_build/test_topbar_launchbtns.html
@@ -5,7 +5,7 @@
    Binder
   </button>
  </a>
- <a class="jupyterhub-button" href="https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https://github.com/executablebooks/sphinx-book-theme&amp;urlpath=lab/tree/sphinx-book-theme/TESTPATH/section1/ntbk.ipynb">
+ <a class="jupyterhub-button" href="https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https://github.com/executablebooks/sphinx-book-theme&amp;urlpath=lab/tree/sphinx-book-theme/TESTPATH/section1/ntbk.ipynb&amp;branch=master">
   <button class="btn btn-secondary topbarbtn" data-placement="left" data-toggle="tooltip" title="Launch JupyterHub" type="button">
    <img alt="Interact on JupyterHub" class="jupyterhub-button-logo" src="../_static/images/logo_jupyterhub.svg"/>
    JupyterHub