From fb7015e7cec6c56bb722d3e62f2b09040051cbaf Mon Sep 17 00:00:00 2001 From: Georgiana Date: Fri, 24 May 2024 14:47:10 +0300 Subject: [PATCH 1/7] Install pycurl from source --- images/binderhub-service/requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/binderhub-service/requirements.in b/images/binderhub-service/requirements.in index a382677..efb65e5 100644 --- a/images/binderhub-service/requirements.in +++ b/images/binderhub-service/requirements.in @@ -2,4 +2,4 @@ # To update requirements.txt, use the "Run workflow" button at # https://github.com/2i2c-org/binderhub-service/actions/workflows/watch-dependencies.yaml # -binderhub[pycurl] @ https://github.com/jupyterhub/binderhub/archive/main.zip +binderhub[pycurl] @ https://github.com/jupyterhub/binderhub/archive/main.zip --no-binary pycurl From 95b492aaa0fde0284252fd432d5ffb126867dec0 Mon Sep 17 00:00:00 2001 From: GeorgianaElena <7579677+GeorgianaElena@users.noreply.github.com> Date: Fri, 24 May 2024 12:12:27 +0000 Subject: [PATCH 2/7] binderhub-service image: refreeze requirements.txt --- images/binderhub-service/requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/binderhub-service/requirements.txt b/images/binderhub-service/requirements.txt index 0baef7a..69300ed 100644 --- a/images/binderhub-service/requirements.txt +++ b/images/binderhub-service/requirements.txt @@ -4,6 +4,8 @@ # # Use the "Run workflow" button at https://github.com/2i2c-org/binderhub-service/actions/workflows/watch-dependencies.yaml # +--no-binary pycurl + alembic==1.13.1 # via jupyterhub annotated-types==0.7.0 From cd031d9ff6711278ca37e9368c1c90de0ab31024 Mon Sep 17 00:00:00 2001 From: Georgiana Date: Fri, 24 May 2024 15:18:55 +0300 Subject: [PATCH 3/7] Update requirements.in to specify pycurl separately --- images/binderhub-service/requirements.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/binderhub-service/requirements.in b/images/binderhub-service/requirements.in index efb65e5..0dea427 100644 --- a/images/binderhub-service/requirements.in +++ b/images/binderhub-service/requirements.in @@ -2,4 +2,5 @@ # To update requirements.txt, use the "Run workflow" button at # https://github.com/2i2c-org/binderhub-service/actions/workflows/watch-dependencies.yaml # -binderhub[pycurl] @ https://github.com/jupyterhub/binderhub/archive/main.zip --no-binary pycurl +binderhub @ https://github.com/jupyterhub/binderhub/archive/main.zip +pycurl --no-binary From 4587ac36d36a5be7cb14937579cd0001671d41e1 Mon Sep 17 00:00:00 2001 From: Georgiana Date: Fri, 24 May 2024 15:30:33 +0300 Subject: [PATCH 4/7] The other way around --- images/binderhub-service/requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/binderhub-service/requirements.in b/images/binderhub-service/requirements.in index 0dea427..79ef570 100644 --- a/images/binderhub-service/requirements.in +++ b/images/binderhub-service/requirements.in @@ -3,4 +3,4 @@ # https://github.com/2i2c-org/binderhub-service/actions/workflows/watch-dependencies.yaml # binderhub @ https://github.com/jupyterhub/binderhub/archive/main.zip -pycurl --no-binary +--no-binary pycurl From ddc4c34693ddabc04e3328d7eb4afb701f99c3ab Mon Sep 17 00:00:00 2001 From: GeorgianaElena <7579677+GeorgianaElena@users.noreply.github.com> Date: Fri, 24 May 2024 12:31:42 +0000 Subject: [PATCH 5/7] binderhub-service image: refreeze requirements.txt --- images/binderhub-service/requirements.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/images/binderhub-service/requirements.txt b/images/binderhub-service/requirements.txt index 69300ed..9d1d76c 100644 --- a/images/binderhub-service/requirements.txt +++ b/images/binderhub-service/requirements.txt @@ -17,9 +17,7 @@ attrs==23.2.0 # jsonschema # referencing binderhub @ https://github.com/jupyterhub/binderhub/archive/main.zip - # via - # -r requirements.in - # binderhub + # via -r requirements.in cachetools==5.3.3 # via google-auth certifi==2024.2.2 @@ -96,8 +94,6 @@ pyasn1-modules==0.4.0 # via google-auth pycparser==2.22 # via cffi -pycurl==7.45.3 - # via binderhub pydantic==2.7.1 # via jupyterhub pydantic-core==2.18.2 From d7e3287ec495790517b65f0da4b0de23d6ab08c0 Mon Sep 17 00:00:00 2001 From: Georgiana Date: Fri, 24 May 2024 15:39:33 +0300 Subject: [PATCH 6/7] Update requirements.in --- images/binderhub-service/requirements.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/images/binderhub-service/requirements.in b/images/binderhub-service/requirements.in index 79ef570..9bb695b 100644 --- a/images/binderhub-service/requirements.in +++ b/images/binderhub-service/requirements.in @@ -2,5 +2,4 @@ # To update requirements.txt, use the "Run workflow" button at # https://github.com/2i2c-org/binderhub-service/actions/workflows/watch-dependencies.yaml # -binderhub @ https://github.com/jupyterhub/binderhub/archive/main.zip ---no-binary pycurl +binderhub[pycurl] @ git+https://github.com/jupyterhub/binderhub@main From c03f07f5df597c5feaa449bdb147d6e6c8498e83 Mon Sep 17 00:00:00 2001 From: GeorgianaElena <7579677+GeorgianaElena@users.noreply.github.com> Date: Fri, 24 May 2024 12:40:38 +0000 Subject: [PATCH 7/7] binderhub-service image: refreeze requirements.txt --- images/binderhub-service/requirements.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/images/binderhub-service/requirements.txt b/images/binderhub-service/requirements.txt index 9d1d76c..038bb75 100644 --- a/images/binderhub-service/requirements.txt +++ b/images/binderhub-service/requirements.txt @@ -4,8 +4,6 @@ # # Use the "Run workflow" button at https://github.com/2i2c-org/binderhub-service/actions/workflows/watch-dependencies.yaml # ---no-binary pycurl - alembic==1.13.1 # via jupyterhub annotated-types==0.7.0 @@ -16,8 +14,10 @@ attrs==23.2.0 # via # jsonschema # referencing -binderhub @ https://github.com/jupyterhub/binderhub/archive/main.zip - # via -r requirements.in +binderhub @ git+https://github.com/jupyterhub/binderhub@main + # via + # -r requirements.in + # binderhub cachetools==5.3.3 # via google-auth certifi==2024.2.2 @@ -94,6 +94,8 @@ pyasn1-modules==0.4.0 # via google-auth pycparser==2.22 # via cffi +pycurl==7.45.3 + # via binderhub pydantic==2.7.1 # via jupyterhub pydantic-core==2.18.2