Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix python dependencies #973

Merged
merged 6 commits into from
Sep 30, 2024
Merged

Fix python dependencies #973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
29294f9
Add pip version diagnostic
grafnu Sep 30, 2024
4dd62ea
Fix gencode typo
grafnu Sep 30, 2024
614689d
Add venv pip upgrade
grafnu Sep 30, 2024
3ba4581
Updating versions
grafnu Sep 30, 2024
ec6bc8e
Adding some explicit dependencies
grafnu Sep 30, 2024
0f5afd4
Adding some more implicit dependencies
grafnu Sep 30, 2024
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
3 changes: 3 additions & 0 deletions .github/workflows/testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ jobs:
- name: all test output
if: ${{ !cancelled() }}
run: more out/test_*
- name: gencode test output
if: ${{ !cancelled() }}
run: more out/test_bin+gencode+check
- name: validator test output
if: ${{ !cancelled() }}
run: more out/test_validator+bin+build+check
Expand Down
3 changes: 2 additions & 1 deletion bin/gencode
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ fi

venv_pip3=$(bin/which_venv_pip3)

$venv_pip3 --version
$venv_pip3 freeze > $tmpfile
if ! diff $tmpfile etc/requirements.txt; then
echo venv sanity check failed: diff $tmpfile etc/requirements.txt
echo venv sanity check failed: diff \$\($venv_pip3 freeze\) etc/requirements.txt
echo please run bin/setup_base
false
fi
Expand Down
1 change: 1 addition & 0 deletions bin/setup_base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ python3 --version
python3 -m venv venv

venv_pip3=$($(dirname $0)/which_venv_pip3)
$(dirname ${venv_pip3})/python3 -m pip install --upgrade pip
${venv_pip3} install ${NO_CACHE_DIR:+--no-cache-dir} -r etc/requirements.txt

java -version
1 change: 1 addition & 0 deletions bin/which_venv_pip3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash -e

for f in venv/bin/pip3 $HOME/venv/bin/pip3; do
if [[ -x "$f" ]]; then
echo "$f"
Expand Down
15 changes: 12 additions & 3 deletions etc/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,23 @@ certifi==2024.7.4
charset-normalizer==2.0.11
click==8.0.3
dataclasses-json==0.5.6
Deprecated==1.2.14
dill==0.3.6
google-api-core==2.5.0
google-api-core==2.20.0
google-api-python-client==2.37.0
google-auth==2.6.0
google-auth==2.14.1
google-auth-httplib2==0.1.0
google-auth-oauthlib==0.4.6
google-cloud-pubsub==2.12.1
googleapis-common-protos==1.54.0
google-cloud-trace==1.13.5
googleapis-common-protos==1.65.0
grpc-google-iam-v1==0.12.3
grpcio==1.65.1
grpcio-status==1.65.1
htmlmin==0.1.12
httplib2==0.20.4
idna==3.7
importlib_metadata==8.4.0
isort==5.11.3
Jinja2==3.1.4
json-schema-for-humans==0.40
Expand All @@ -30,6 +33,11 @@ marshmallow-enum==1.5.1
mccabe==0.7.0
mypy-extensions==0.4.3
oauthlib==3.2.2
opentelemetry-api==1.27.0
opentelemetry-exporter-gcp-trace==1.7.0
opentelemetry-resourcedetector-gcp==1.7.0a0
opentelemetry-sdk==1.27.0
opentelemetry-semantic-conventions==0.48b0
platformdirs==2.6.0
proto-plus==1.24.0
protobuf==5.26.1
Expand All @@ -51,3 +59,4 @@ typing_extensions==4.0.1
uritemplate==4.1.1
urllib3==1.26.19
wrapt==1.14.1
zipp==3.20.2
Loading