Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions binderhub/repoproviders.py
Original file line number Diff line number Diff line change
Expand Up @@ -357,16 +357,16 @@ 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()
req = HTTPRequest(f"https://doi.org/{self.spec}", user_agent="BinderHub")
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}"
Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/images/binderhub/requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/images/binderhub/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion testing/local-binder-local-hub/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Loading