From 0e690c21dbd8a36740fb13cc9c740a7928b5d3e7 Mon Sep 17 00:00:00 2001 From: Dan King Date: Wed, 7 Dec 2022 12:41:01 -0500 Subject: [PATCH 1/3] [service-base] fix libsass by downgrading google-cloud-profiler --- docker/service-base-requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/service-base-requirements.txt b/docker/service-base-requirements.txt index 3956bd7c4f9..5cabad61578 100644 --- a/docker/service-base-requirements.txt +++ b/docker/service-base-requirements.txt @@ -1 +1,3 @@ -google-cloud-profiler==4.0.0 +# https://github.com/sass/libsass-python/issues/413 +google-cloud-profiler<4.0.0 +protobuf<=3.20.0 From 4d14d336335b5e40d41d62756eeb9bc1a266229b Mon Sep 17 00:00:00 2001 From: Dan King Date: Wed, 7 Dec 2022 15:02:19 -0500 Subject: [PATCH 2/3] downgrade protobuf --- docker/linux-pinned-requirements.txt | 26 +++++++++++++------------- docker/requirements.txt | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docker/linux-pinned-requirements.txt b/docker/linux-pinned-requirements.txt index 18985ff9c57..1416ea207e4 100644 --- a/docker/linux-pinned-requirements.txt +++ b/docker/linux-pinned-requirements.txt @@ -1,6 +1,6 @@ # -# This file is autogenerated by pip-compile with python 3.7 -# To update, run: +# This file is autogenerated by pip-compile with Python 3.7 +# by the following command: # # pip-compile --output-file=linux-pinned-requirements.txt requirements.txt # @@ -56,9 +56,9 @@ black==22.10.0 # via -r requirements.txt bleach==5.0.1 # via readme-renderer -boto3==1.26.20 +boto3==1.26.24 # via -r requirements.txt -botocore==1.29.20 +botocore==1.29.24 # via # -r requirements.txt # boto3 @@ -135,11 +135,11 @@ gevent-websocket==0.10.1 # via flask-sockets gidgethub==5.2.1 # via -r requirements.txt -google-api-core==2.10.2 +google-api-core==2.11.0 # via google-api-python-client -google-api-python-client==2.66.0 +google-api-python-client==2.68.0 # via -r requirements.txt -google-auth==2.14.1 +google-auth==2.15.0 # via # google-api-core # google-api-python-client @@ -222,7 +222,7 @@ msal-extensions==1.0.0 # via azure-identity msrest==0.7.1 # via azure-storage-blob -multidict==6.0.2 +multidict==6.0.3 # via # aiohttp # yarl @@ -238,7 +238,7 @@ numpy==1.21.6 # via pandas oauthlib==3.2.2 # via requests-oauthlib -orjson==3.8.2 +orjson==3.8.3 # via -r requirements.txt packaging==21.3 # via @@ -256,7 +256,7 @@ pathspec==0.10.2 # curlylint pkginfo==1.9.2 # via twine -platformdirs==2.5.4 +platformdirs==2.6.0 # via # black # pylint @@ -272,7 +272,7 @@ prometheus-client==0.15.0 # via # -r requirements.txt # prometheus-async -protobuf==4.21.9 +protobuf==3.19.6 # via # -r requirements.txt # google-api-core @@ -415,7 +415,7 @@ typed-ast==1.5.4 # astroid # black # mypy -types-chardet==5.0.4 +types-chardet==5.0.4.1 # via -r requirements.txt types-decorator==5.1.8.1 # via -r requirements.txt @@ -429,7 +429,7 @@ types-pyyaml==6.0.12.2 # via -r requirements.txt types-requests==2.28.11.5 # via -r requirements.txt -types-setuptools==65.6.0.1 +types-setuptools==65.6.0.2 # via -r requirements.txt types-six==1.16.21.4 # via -r requirements.txt diff --git a/docker/requirements.txt b/docker/requirements.txt index 3030db442d8..dd8691b34de 100644 --- a/docker/requirements.txt +++ b/docker/requirements.txt @@ -46,7 +46,7 @@ pandas>=1.3.0,<1.5.0 plotly>=5.5.0,<6 prometheus_async>=19.2.0,<20 prometheus_client>=0.11.0,<1 -protobuf==4.21.9 +protobuf<=3.20.0 psutil>=5.9.0,<6 pyjwt>=2.4.0,<3 pylint==2.15.4 From 00dec51e61411e974f0a8eeb40648a48269c64d4 Mon Sep 17 00:00:00 2001 From: Dan King Date: Tue, 13 Dec 2022 14:23:52 -0500 Subject: [PATCH 3/3] remove unnecessary pip installs --- auth/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/auth/Dockerfile b/auth/Dockerfile index 0c2bfa4dad1..a94928c697c 100644 --- a/auth/Dockerfile +++ b/auth/Dockerfile @@ -1,9 +1,5 @@ FROM {{ service_base_image.image }} -RUN hail-pip-install \ - google-auth-oauthlib==0.4.6 \ - google-auth==1.25.0 - COPY auth/setup.py auth/MANIFEST.in /auth/ COPY auth/auth /auth/auth/ RUN hail-pip-install /auth && rm -rf /auth