Bump google libs (pypi#9994)

* Bump google libs * Add a make target to fix google deps * Update Makefile Co-authored-by: Dustin Ingram <di@users.noreply.github.com> Co-authored-by: Dustin Ingram <di@users.noreply.github.com>
MaxMood96 · Sep 2, 2021 · 4421485 · 4421485
1 parent 8ab997e
commit 4421485
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/Makefile b/Makefile
@@ -130,6 +130,19 @@ deps: .state/env/pyvenv.cfg
 requirements/%.txt: requirements/%.in
 	$(BINDIR)/pip-compile --allow-unsafe --generate-hashes --output-file=$@ $<
 
+fix-google-deps:
+	# Fixes issues caused by https://github.com/pypa/pip/issues/9644
+	# Whenever you have the following error:
+	#     ERROR: In --require-hashes mode, all requirements must have their versions
+	#     pinned with ==. These do not: google-<something>
+	# Launch this target on a new branch against main, and submit a PR with the result.
+
+	pip-compile --allow-unsafe --generate-hashes --output-file=requirements/main.txt \
+	    --upgrade-package google-cloud-storage \
+	    --upgrade-package google-cloud-bigquery \
+	    --upgrade-package google-cloud-core \
+	    --upgrade-package google-api-core \
+	    requirements/main.in
 
 github-actions-deps:
 ifneq ($(GITHUB_BASE_REF), false)

diff --git a/requirements/main.txt b/requirements/main.txt
@@ -286,32 +286,33 @@ first==2.0.2 \
 future==0.18.2 \
     --hash=sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d
     # via webauthn
-google-api-core[grpc]==1.31.0 \
-    --hash=sha256:7c8ba88e2b893ef4f67d67e229aade51a2db5053023b73b1394a5ee3dcdb561c \
-    --hash=sha256:a9f979b5c6a9cad31a4120ca6be712df76adc32336a7bf4bc2f4331a1b527fe7
+google-api-core[grpc]==2.0.1 \
+    --hash=sha256:b8ad41f72a70dd709dd13a08478936172aecf5f2d34a18ab378efa6d2d6ab575 \
+    --hash=sha256:d6760f21b3a064a8397916b33be7383fc169d1a3c3d7fae7b47eb92bba7892b8
     # via
     #   google-cloud-bigquery
     #   google-cloud-core
+    #   google-cloud-storage
 google-auth==1.34.0 \
     --hash=sha256:bd6aa5916970a823e76ffb3d5c3ad3f0bedafca0a7fa53bc15149ab21cb71e05 \
     --hash=sha256:f1094088bae046fb06f3d1a3d7df14717e8d959e9105b79c57725bd4e17597a2
     # via
     #   google-api-core
     #   google-cloud-core
     #   google-cloud-storage
-google-cloud-bigquery==2.23.2 \
-    --hash=sha256:38ec0bf0f120f5aacb1620c197367904e35f824e7aa40a08c4d65aa70516e550 \
-    --hash=sha256:b0d2304bf4e85b2823da3f5ce648b0ab68a5ea909e213c4bed9ee05ea49d00a0
+google-cloud-bigquery==2.26.0 \
+    --hash=sha256:15ca1f9c8165b584c2d593620354cd3b17c007e87cfd1abd1eebd2c08eb5d109 \
+    --hash=sha256:8431da4c3f9b6a5aca1b811ef64e452d53536160b26252e4d132969ef3e4f173
     # via -r requirements/main.in
-google-cloud-core==1.7.2 \
-    --hash=sha256:5b77935f3d9573e27007749a3b522f08d764c5b5930ff1527b2ab2743e9f0c15 \
-    --hash=sha256:b1030aadcbb2aeb4ee51475426351af83c1072456b918fb8fdb80666c4bb63b5
+google-cloud-core==2.0.0 \
+    --hash=sha256:31785d1e1d02f90ad3f1b020d4aed63db4865c3394ff7c128a296b6995eef31f \
+    --hash=sha256:90ee99648ccf9e11a16781a7fc58d13e58f662b439c737d48c24ef18662c2702
     # via
     #   google-cloud-bigquery
     #   google-cloud-storage
-google-cloud-storage==1.41.1 \
-    --hash=sha256:a81ecc0f382b8e4437cc7f152f74d77ef917c8280a5d1040f5dcfbd0502c7906 \
-    --hash=sha256:cd4c9039eb0017fdc75c3f96b0b5ea57759ceefe3a0401d514bcf0111cd7a508
+google-cloud-storage==1.42.0 \
+    --hash=sha256:92a9c8b1a6a278c5c12877fe1a966ecd0cae327cf98c6ae50deedf1a32d6cf2b \
+    --hash=sha256:c1dd3d09198edcf24ec6803dd4545e867d82b998f06a68ead3b6857b1840bdae
     # via -r requirements/main.in
 google-crc32c==1.1.2 \
     --hash=sha256:0ae3cf54e0d4d83c8af1afe96fc0970fbf32f1b29275f3bfd44ce25c4b622a2b \
@@ -668,7 +669,6 @@ packaging==21.0 \
     # via
     #   -r requirements/main.in
     #   bleach
-    #   google-api-core
     #   google-cloud-bigquery
 paginate==0.5.6 \
     --hash=sha256:5e6007b6a9398177a7e1648d04fdd9f8c9766a1a945bceac82f1929e8c78af2d
@@ -881,7 +881,6 @@ pytz==2021.1 \
     # via
     #   babel
     #   celery
-    #   google-api-core
 readme-renderer[md]==29.0 \
     --hash=sha256:63b4075c6698fcfa78e584930f07f39e05d46f3ec97f65006e430b595ca6348c \
     --hash=sha256:92fd5ac2bf8677f310f3303aa4bce5b9d5f9f2094ab98c29f13791d7b805a3db
@@ -936,9 +935,7 @@ six==1.16.0 \
     #   bcrypt
     #   bleach
     #   elasticsearch-dsl
-    #   google-api-core
     #   google-auth
-    #   google-cloud-core
     #   google-resumable-media
     #   grpcio
     #   html5lib