From aa4d17c19eb95cc30efdc089a97b0002645973aa Mon Sep 17 00:00:00 2001 From: chiku Date: Fri, 20 Feb 2026 16:29:09 +0900 Subject: [PATCH 1/3] Update CS-repo2docker to 2026.02.0 --- dev-requirements.txt | 2 +- helm-chart/images/binderhub/requirements.in | 2 +- helm-chart/images/binderhub/requirements.txt | 2 +- requirements.txt | 2 +- testing/local-binder-local-hub/requirements.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 8d643e295..3ce5d279e 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -4,7 +4,7 @@ chartpress>=2.1 click dockerspawner jsonschema -jupyter-repo2docker @ git+https://github.com/RCOSDP/CS-repo2docker.git@2025.10.0 +jupyter-repo2docker @ git+https://github.com/RCOSDP/CS-repo2docker.git@2026.02.0 jupyter_packaging>=0.10.4,<2 jupyterhub @ git+https://github.com/RCOSDP/CS-jupyterhub.git@5.2.1 nest-asyncio diff --git a/helm-chart/images/binderhub/requirements.in b/helm-chart/images/binderhub/requirements.in index 6dff2a870..f38f38e10 100644 --- a/helm-chart/images/binderhub/requirements.in +++ b/helm-chart/images/binderhub/requirements.in @@ -12,7 +12,7 @@ google-cloud-logging==3.* jupyterhub @ git+https://github.com/RCOSDP/CS-jupyterhub.git@5.2.1 # jupyter-repo2docker is pinned to CS-repo2docker -jupyter-repo2docker @ git+https://github.com/RCOSDP/CS-repo2docker.git@2025.10.0 +jupyter-repo2docker @ git+https://github.com/RCOSDP/CS-repo2docker.git@2026.02.0 # Workaround: Added a dependecy of ruamel-yaml because jupyter-telemetry, # which has a dependency of ruamel-yaml, was removed from jupyterhub. diff --git a/helm-chart/images/binderhub/requirements.txt b/helm-chart/images/binderhub/requirements.txt index fe4a8a296..5c0134ae4 100644 --- a/helm-chart/images/binderhub/requirements.txt +++ b/helm-chart/images/binderhub/requirements.txt @@ -123,7 +123,7 @@ jsonschema-specifications==2025.9.1 # via jsonschema jupyter-events==0.12.0 # via jupyterhub -jupyter-repo2docker @ git+https://github.com/RCOSDP/CS-repo2docker.git@2025.10.0 +jupyter-repo2docker @ git+https://github.com/RCOSDP/CS-repo2docker.git@2026.02.0 # via # -r helm-chart/images/binderhub/../../../requirements.txt # -r helm-chart/images/binderhub/requirements.in diff --git a/requirements.txt b/requirements.txt index ca778986b..f38f5f77d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ escapism jinja2 jsonschema jupyterhub @ git+https://github.com/RCOSDP/CS-jupyterhub.git@5.2.1 -jupyter-repo2docker @ git+https://github.com/RCOSDP/CS-repo2docker.git@2025.10.0 +jupyter-repo2docker @ git+https://github.com/RCOSDP/CS-repo2docker.git@2026.02.0 kubernetes prometheus_client pyjwt>=2 diff --git a/testing/local-binder-local-hub/requirements.txt b/testing/local-binder-local-hub/requirements.txt index 095332229..12fe8bad6 100644 --- a/testing/local-binder-local-hub/requirements.txt +++ b/testing/local-binder-local-hub/requirements.txt @@ -1,3 +1,3 @@ dockerspawner>=12 -jupyter-repo2docker @ git+https://github.com/RCOSDP/CS-repo2docker.git@2025.10.0 +jupyter-repo2docker @ git+https://github.com/RCOSDP/CS-repo2docker.git@2026.02.0 jupyterhub @ git+https://github.com/RCOSDP/CS-jupyterhub.git@5.2.1 From 5180fa83feb83fa287a49bf5d9eaa6f6cde953f5 Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 14 Jan 2026 17:07:35 -0800 Subject: [PATCH 2/3] figshare url structure changed --- binderhub/repoproviders.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/binderhub/repoproviders.py b/binderhub/repoproviders.py index 979b0beb8..ebd937bd2 100644 --- a/binderhub/repoproviders.py +++ b/binderhub/repoproviders.py @@ -357,7 +357,7 @@ class FigshareProvider(RepoProvider): "ref": {"enabled": False}, } - url_regex = re.compile(r"(.*)/articles/([^/]+)/([^/]+)/(\d+)(/)?(\d+)?") + url_regex = re.compile(r"(.*)/articles/([^/]+)/(\d+)(/)?(\d+)?") async def get_resolved_ref(self): client = AsyncHTTPClient() @@ -365,8 +365,8 @@ async def get_resolved_ref(self): r = await client.fetch(req) match = self.url_regex.match(r.effective_url) - article_id = match.groups()[3] - article_version = match.groups()[5] + article_id = match.groups()[2] + article_version = match.groups()[4] if not article_version: article_version = "1" self.record_id = f"{article_id}.v{article_version}" From a3afbd323fbdde6ce5066e36c310c2a7ce73df60 Mon Sep 17 00:00:00 2001 From: chiku Date: Fri, 20 Feb 2026 19:17:52 +0900 Subject: [PATCH 3/3] Increase wait time and retry count for JupyterHub startup in test-local JupyterHub with BinderHub as a managed service can take longer than 5s to fully start and register proxy routes, especially on CI runners. This causes intermittent 404 errors when curling /hub/api/. Increase the initial sleep from 5s to 15s and make curl retries more patient. --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 21dd6e2da..95fe2e71d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -457,10 +457,10 @@ jobs: run: | cd testing/local-binder-local-hub jupyterhub --config=jupyterhub_config.py > jupyterhub.log 2>&1 & - sleep 5 + sleep 15 echo curl http://localhost:8000/hub/api/ should print the JupyterHub version - curl http://localhost:8000/hub/api/ --max-time 5 --retry 5 --retry-delay 1 --retry-connrefused --fail-with-body --retry-all-errors + curl http://localhost:8000/hub/api/ --max-time 10 --retry 5 --retry-delay 3 --retry-connrefused --fail-with-body --retry-all-errors - name: Run remote tests run: |