Skip to content

Commit

Permalink
Merge pull request #101 from uc-cdis/fix/update_beam
Browse files Browse the repository at this point in the history
Fix Google dataflow install error
  • Loading branch information
MaribelleHGomez authored Dec 14, 2021
2 parents b8c0bd7 + bd6799d commit bfd8519
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
14 changes: 7 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
python_dateutil==2.8.0
requests>=2.20.0<3.0.0
boto3>=1.9.111
python_dateutil==2.8.2
requests>=2.26.0<3.0.0
boto3==1.20.24
retry==0.9.2
google-cloud==0.34.0
google-resumable-media==0.3.1
google-cloud-storage==1.6.0
setuptools==40.3.0
apache-beam[gcp]==2.16.0
google-resumable-media==2.1.0
google-cloud-storage==1.43.0
apache-beam[gcp]==2.34.0
setuptools==59.6.0
-e git+https://[email protected]/uc-cdis/[email protected]#egg=cdislogging
# For the Google script, indexclient source must also be available as a zip
# file and fed to the script using option "--extra_package" (until package is
Expand Down
8 changes: 4 additions & 4 deletions scripts/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
requests==2.20.0
requests==2.26.0
retry==0.9.2
google-auth==1.4.1
google-resumable-media==0.3.1
google-cloud-storage==1.10.0
google-auth==2.3.3
google-resumable-media==2.1.0
google-cloud-storage==1.43.0
-e git+https://[email protected]/uc-cdis/[email protected]#egg=cdislogging
-e git+https://[email protected]/uc-cdis/[email protected]#egg=cdiserrors
14 changes: 7 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
import setuptools

REQUIRED_PACKAGES = [
"python_dateutil==2.8.0",
"requests>=2.18.0<3.0.0",
"boto3>=1.9.111",
"python_dateutil==2.8.2",
"requests>=2.26.0<3.0.0",
"boto3==1.20.24",
"google-cloud==0.34.0",
"google-resumable-media==0.3.1",
"google-cloud-storage==1.6.0",
"apache-beam[gcp]==2.16.0",
"setuptools==40.3.0",
"google-resumable-media==2.1.0",
"google-cloud-storage==1.43.0",
"apache-beam[gcp]==2.34.0",
"setuptools==59.6.0",
]

PACKAGE_NAME = "scripts"
Expand Down

0 comments on commit bfd8519

Please sign in to comment.