Skip to content

Commit

Permalink
[service-base] fix libsass by downgrading google-cloud-profiler (#12544)
Browse files Browse the repository at this point in the history
* [service-base] fix libsass by downgrading google-cloud-profiler

* downgrade protobuf

* remove unnecessary pip installs
  • Loading branch information
danking authored Dec 14, 2022
1 parent 3133bf9 commit fa77bce
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 19 deletions.
4 changes: 0 additions & 4 deletions auth/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
26 changes: 13 additions & 13 deletions docker/linux-pinned-requirements.txt
Original file line number Diff line number Diff line change
@@ -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
#
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion docker/service-base-requirements.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit fa77bce

Please sign in to comment.