From d9db496bc64b2042e598a2b37cc993a8dbfcdf6c Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 5 Nov 2018 14:48:31 -0500 Subject: [PATCH 1/2] Datastore: bump minimum 'api_core' version to 1.4.1. Closes #6390. --- datastore/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datastore/setup.py b/datastore/setup.py index 1804121dd36f..af1793acb4c1 100644 --- a/datastore/setup.py +++ b/datastore/setup.py @@ -30,7 +30,7 @@ release_status = 'Development Status :: 5 - Production/Stable' dependencies = [ 'google-cloud-core<0.29dev,>=0.28.0', - 'google-api-core[grpc]<2.0.0dev,>=1.0.0', + 'google-api-core[grpc]<2.0.0dev,>=1.4.1', ] extras = { } From 11be972c06608466da68ebdeee2cab80e4e50695 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 5 Nov 2018 16:15:17 -0500 Subject: [PATCH 2/2] Normalize dependencies: - Bump minimum 'google-api_core' version for all GAPIC libs to 1.4.1. - Lower bounds before upper bounds. - Whitespace for legibility. - Sort them topologically / consistently. --- api_core/setup.py | 18 +++++++++--------- asset/setup.py | 4 ++-- automl/setup.py | 2 +- bigquery/setup.py | 6 +++--- bigquery_datatransfer/setup.py | 2 +- bigtable/setup.py | 6 +++--- container/setup.py | 2 +- core/setup.py | 4 ++-- dataproc/setup.py | 2 +- datastore/setup.py | 4 ++-- dlp/setup.py | 2 +- dns/setup.py | 4 ++-- firestore/setup.py | 4 ++-- iot/setup.py | 4 ++-- kms/setup.py | 4 ++-- language/setup.py | 2 +- logging/setup.py | 4 ++-- monitoring/setup.py | 4 ++-- oslogin/setup.py | 2 +- pubsub/setup.py | 2 +- redis/setup.py | 2 +- resource_manager/setup.py | 4 ++-- runtimeconfig/setup.py | 4 ++-- securitycenter/setup.py | 4 ++-- spanner/setup.py | 6 +++--- speech/setup.py | 2 +- storage/setup.py | 6 +++--- tasks/setup.py | 4 ++-- texttospeech/setup.py | 2 +- trace/setup.py | 4 ++-- translate/setup.py | 4 ++-- videointelligence/setup.py | 2 +- vision/setup.py | 2 +- websecurityscanner/setup.py | 2 +- 34 files changed, 65 insertions(+), 65 deletions(-) diff --git a/api_core/setup.py b/api_core/setup.py index 4fc19204e435..46f6de02b026 100644 --- a/api_core/setup.py +++ b/api_core/setup.py @@ -29,18 +29,18 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 5 - Production/Stable' dependencies = [ - 'googleapis-common-protos<2.0dev,>=1.5.3,!=1.5.4', - 'protobuf>=3.4.0', - 'google-auth<2.0.0dev,>=0.4.0', - 'requests<3.0.0dev,>=2.18.0', - 'setuptools>=34.0.0', - 'six>=1.10.0', + 'googleapis-common-protos >= 1.5.3, != 1.5.4, < 2.0dev', + 'protobuf >= 3.4.0', + 'google-auth >= 0.4.0, < 2.0dev', + 'requests >= 2.18.0, < 3.0.0dev', + 'setuptools >= 34.0.0', + 'six >= 1.10.0', 'pytz', - 'futures>=3.2.0;python_version<"3.2"' + 'futures >= 3.2.0; python_version < "3.2"' ] extras = { - 'grpc': 'grpcio>=1.8.2', - 'grpcio-gcp': 'grpcio-gcp>=0.2.2' + 'grpc': 'grpcio >= 1.8.2', + 'grpcio-gcp': 'grpcio-gcp >= 0.2.2' } diff --git a/asset/setup.py b/asset/setup.py index 31f9e8674d00..26b101040869 100644 --- a/asset/setup.py +++ b/asset/setup.py @@ -28,9 +28,9 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc] >= 1.1.0, < 2.0.0dev', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', 'enum34; python_version < "3.4"', - 'grpc-google-iam-v1<0.12dev,>=0.11.4', + 'grpc-google-iam-v1 >= 0.11.4, < 0.12dev', ] # Setup boilerplate below this line. diff --git a/automl/setup.py b/automl/setup.py index 63fb889e2990..d819e8bb7ce2 100644 --- a/automl/setup.py +++ b/automl/setup.py @@ -22,7 +22,7 @@ version = '0.1.1' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc] >= 1.1.0, < 2.0.0dev', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', 'enum34; python_version < "3.4"', ] diff --git a/bigquery/setup.py b/bigquery/setup.py index c1416dc1d695..5c4aa468d74d 100644 --- a/bigquery/setup.py +++ b/bigquery/setup.py @@ -29,9 +29,9 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 5 - Production/Stable' dependencies = [ - 'google-cloud-core<0.29dev,>=0.28.0', - 'google-api-core<2.0.0dev,>=1.0.0', - 'google-resumable-media>=0.2.1', + 'google-api-core >= 1.0.0, < 2.0.0dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', + 'google-resumable-media >= 0.3.1', ] extras = { 'pandas': 'pandas>=0.17.1', diff --git a/bigquery_datatransfer/setup.py b/bigquery_datatransfer/setup.py index 3e2b0eacd649..4eaf596b142c 100644 --- a/bigquery_datatransfer/setup.py +++ b/bigquery_datatransfer/setup.py @@ -29,7 +29,7 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc]<2.0.0dev,>=0.1.0', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', ] extras = { } diff --git a/bigtable/setup.py b/bigtable/setup.py index 83d7cad45bf2..892cd4dcc008 100644 --- a/bigtable/setup.py +++ b/bigtable/setup.py @@ -29,9 +29,9 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 4 - Beta' dependencies = [ - 'google-cloud-core<0.29dev,>=0.28.0', - 'google-api-core[grpc]<2.0.0dev,>=0.1.1', - 'grpc-google-iam-v1<0.12dev,>=0.11.4', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', + 'google-cloud-core >= 0.28.0, <0.29dev', + 'grpc-google-iam-v1 >= 0.11.4, < 0.12dev', ] extras = { } diff --git a/container/setup.py b/container/setup.py index bcdb43c122ca..c50f95431f9c 100644 --- a/container/setup.py +++ b/container/setup.py @@ -29,7 +29,7 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc]<2.0.0dev,>=0.1.0', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', ] extras = { } diff --git a/core/setup.py b/core/setup.py index 37d8bf0b0d47..26bf1f02c232 100644 --- a/core/setup.py +++ b/core/setup.py @@ -29,10 +29,10 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 4 - Beta' dependencies = [ - 'google-api-core<2.0.0dev,>=0.1.1', + 'google-api-core >= 1.0.0, < 2.0.0dev', ] extras = { - 'grpc': 'grpcio>=1.8.2', + 'grpc': 'grpcio >= 1.8.2', } diff --git a/dataproc/setup.py b/dataproc/setup.py index 4c26cb8ef50b..df1914b28b76 100644 --- a/dataproc/setup.py +++ b/dataproc/setup.py @@ -29,7 +29,7 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc]<2.0.0dev,>=0.1.0', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', ] extras = { } diff --git a/datastore/setup.py b/datastore/setup.py index af1793acb4c1..7cf1a2491e6d 100644 --- a/datastore/setup.py +++ b/datastore/setup.py @@ -29,8 +29,8 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 5 - Production/Stable' dependencies = [ - 'google-cloud-core<0.29dev,>=0.28.0', - 'google-api-core[grpc]<2.0.0dev,>=1.4.1', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', + 'google-cloud-core >=0.28.0, <0.29dev', ] extras = { } diff --git a/dlp/setup.py b/dlp/setup.py index 38b3087f2fbd..24621803a015 100644 --- a/dlp/setup.py +++ b/dlp/setup.py @@ -24,7 +24,7 @@ version = '0.9.0' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc] >= 1.1.0, < 2.0.0dev', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', 'enum34; python_version < "3.4"', ] diff --git a/dns/setup.py b/dns/setup.py index c2e72004167c..2d768e30f2ee 100644 --- a/dns/setup.py +++ b/dns/setup.py @@ -29,8 +29,8 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-cloud-core<0.29dev,>=0.28.0', - 'google-api-core<2.0.0dev,>=0.1.1', + 'google-api-core >= 1.0.0, < 2.0.0dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', ] extras = { } diff --git a/firestore/setup.py b/firestore/setup.py index 73d2233a6fd9..794467751283 100644 --- a/firestore/setup.py +++ b/firestore/setup.py @@ -29,8 +29,8 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 4 - Beta' dependencies = [ - 'google-cloud-core<0.29dev,>=0.28.0', - 'google-api-core[grpc]<2.0.0dev,>=0.1.1', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', ] extras = { } diff --git a/iot/setup.py b/iot/setup.py index 7ddf283b815a..e856f5542aff 100644 --- a/iot/setup.py +++ b/iot/setup.py @@ -22,8 +22,8 @@ version = '0.1.0' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc] >= 1.1.0, < 2.0.0dev', - 'grpc-google-iam-v1<0.12dev,>=0.11.4', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', + 'grpc-google-iam-v1 >= 0.11.4, < 0.12dev', 'enum34; python_version < "3.4"', ] diff --git a/kms/setup.py b/kms/setup.py index e4ec8881c879..6159fb7cce99 100644 --- a/kms/setup.py +++ b/kms/setup.py @@ -24,8 +24,8 @@ version = '0.2.0' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc] >= 1.1.0, < 2.0.0dev', - 'grpc-google-iam-v1<0.12dev,>=0.11.4', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', + 'grpc-google-iam-v1 >= 0.11.4, < 0.12dev', 'enum34; python_version < "3.4"', ] diff --git a/language/setup.py b/language/setup.py index 6be22ede17f7..75fe19a0e269 100644 --- a/language/setup.py +++ b/language/setup.py @@ -29,7 +29,7 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 5 - Production/Stable' dependencies = [ - 'google-api-core[grpc]<2.0.0dev,>=0.1.1', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', 'enum34;python_version<"3.4"' ] extras = { diff --git a/logging/setup.py b/logging/setup.py index fd996b380ff9..85eeaf96889e 100644 --- a/logging/setup.py +++ b/logging/setup.py @@ -29,8 +29,8 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 5 - Production/Stable' dependencies = [ - 'google-cloud-core<0.29dev,>=0.28.0', - 'google-api-core[grpc]<2.0.0dev,>=1.0.0', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', ] extras = { } diff --git a/monitoring/setup.py b/monitoring/setup.py index 8348d2af8146..9046c556989e 100644 --- a/monitoring/setup.py +++ b/monitoring/setup.py @@ -29,10 +29,10 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc]<2.0.0dev,>=0.1.1', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', ] extras = { - 'pandas': 'pandas>=0.17.1', + 'pandas': 'pandas >= 0.17.1', } diff --git a/oslogin/setup.py b/oslogin/setup.py index 985b77c46390..49577b10c793 100644 --- a/oslogin/setup.py +++ b/oslogin/setup.py @@ -29,7 +29,7 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc]<2.0.0dev,>=0.1.0', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', ] extras = { } diff --git a/pubsub/setup.py b/pubsub/setup.py index aaac99a6bcc0..899b85ca9325 100644 --- a/pubsub/setup.py +++ b/pubsub/setup.py @@ -30,7 +30,7 @@ release_status = 'Development Status :: 4 - Beta' dependencies = [ 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', - 'grpc-google-iam-v1<0.12dev,>=0.11.4', + 'grpc-google-iam-v1 >= 0.11.4, < 0.12dev', 'enum34; python_version < "3.4"', ] extras = { diff --git a/redis/setup.py b/redis/setup.py index a4a466208898..f24540b56cf5 100644 --- a/redis/setup.py +++ b/redis/setup.py @@ -29,7 +29,7 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc] >= 0.1.0, < 0.2.0dev', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', 'enum34; python_version < "3.4"', ] extras = { diff --git a/resource_manager/setup.py b/resource_manager/setup.py index 5d7fd829dfbd..b24ad370d079 100644 --- a/resource_manager/setup.py +++ b/resource_manager/setup.py @@ -29,8 +29,8 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-cloud-core<0.29dev,>=0.28.0', - 'google-api-core<2.0.0dev,>=0.1.1', + 'google-api-core >= 1.0.0, < 2.0.0dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', ] extras = { } diff --git a/runtimeconfig/setup.py b/runtimeconfig/setup.py index e620201e726f..2620776cf1ee 100644 --- a/runtimeconfig/setup.py +++ b/runtimeconfig/setup.py @@ -29,8 +29,8 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-cloud-core<0.29dev,>=0.28.0', - 'google-api-core<2.0.0dev,>=0.1.1', + 'google-api-core >= 1.0.0, < 2.0.0dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', ] extras = { } diff --git a/securitycenter/setup.py b/securitycenter/setup.py index 3c24c682806b..46bd18de233b 100644 --- a/securitycenter/setup.py +++ b/securitycenter/setup.py @@ -24,8 +24,8 @@ version = '0.1.0' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc] >= 1.1.0, < 2.0.0dev', - 'grpc-google-iam-v1<0.12dev,>=0.11.4', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', + 'grpc-google-iam-v1 >= 0.11.4, < 0.12dev', 'enum34; python_version < "3.4"', ] diff --git a/spanner/setup.py b/spanner/setup.py index effdc6318b07..07fdb0341cf7 100644 --- a/spanner/setup.py +++ b/spanner/setup.py @@ -29,9 +29,9 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 5 - Production/Stable' dependencies = [ - 'google-cloud-core<0.29dev,>=0.28.0', - 'google-api-core[grpc, grpcio-gcp]<2.0.0dev,>=1.4.0', - 'grpc-google-iam-v1<0.12dev,>=0.11.4', + 'google-api-core[grpc, grpcio-gcp] >= 1.4.1, < 2.0.0dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', + 'grpc-google-iam-v1 >= 0.11.4, < 0.12dev', ] extras = { } diff --git a/speech/setup.py b/speech/setup.py index 60f53f57a5e4..52cb3ccd0c1c 100644 --- a/speech/setup.py +++ b/speech/setup.py @@ -29,7 +29,7 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 4 - Beta' dependencies = [ - 'google-api-core[grpc]<2.0.0dev,>=0.1.4', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', ] extras = { } diff --git a/storage/setup.py b/storage/setup.py index 57d23c714229..06425d046e0b 100644 --- a/storage/setup.py +++ b/storage/setup.py @@ -29,9 +29,9 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 5 - Production/Stable' dependencies = [ - 'google-cloud-core<0.29dev,>=0.28.0', - 'google-api-core<2.0.0dev,>=0.1.1', - 'google-resumable-media>=0.3.1', + 'google-api-core >= 1.0.0, < 2.0.0dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', + 'google-resumable-media >= 0.3.1', ] extras = { } diff --git a/tasks/setup.py b/tasks/setup.py index fd1fd21f6f50..de593a820538 100644 --- a/tasks/setup.py +++ b/tasks/setup.py @@ -24,9 +24,9 @@ version = '0.3.0' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc] >= 1.1.0, < 2.0.0dev', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', + 'grpc-google-iam-v1 >= 0.11.4, < 0.12dev', 'enum34; python_version < "3.4"', - 'grpc-google-iam-v1<0.12dev,>=0.11.4', ] package_root = os.path.abspath(os.path.dirname(__file__)) diff --git a/texttospeech/setup.py b/texttospeech/setup.py index 5805b91b956c..888a01747ba1 100644 --- a/texttospeech/setup.py +++ b/texttospeech/setup.py @@ -42,7 +42,7 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc] < 2.0.0dev, >= 0.1.0', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', ] extras = { } diff --git a/trace/setup.py b/trace/setup.py index d85ab622dbc2..02e6f3672928 100644 --- a/trace/setup.py +++ b/trace/setup.py @@ -29,8 +29,8 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-cloud-core<0.29dev,>=0.28.0', - 'google-api-core[grpc]<2.0.0dev,>=1.0.0', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', + 'google-cloud-core >=0.28.0, <0.29dev', ] extras = { } diff --git a/translate/setup.py b/translate/setup.py index acdaac25ad26..c13cc273f135 100644 --- a/translate/setup.py +++ b/translate/setup.py @@ -29,8 +29,8 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 5 - Production/Stable' dependencies = [ - 'google-cloud-core<0.29dev,>=0.28.0', - 'google-api-core<2.0.0dev,>=0.1.1', + 'google-api-core >= 1.0.0, < 2.0.0dev', + 'google-cloud-core >= 0.28.0, < 0.29dev', ] extras = { } diff --git a/videointelligence/setup.py b/videointelligence/setup.py index 576ffe548dd8..f1dd87d306b9 100644 --- a/videointelligence/setup.py +++ b/videointelligence/setup.py @@ -29,7 +29,7 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 5 - Production/Stable' dependencies = [ - 'google-api-core[grpc]<2.0.0dev,>=0.1.0', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', ] extras = { } diff --git a/vision/setup.py b/vision/setup.py index d27aca598b5c..e0bdc639b204 100644 --- a/vision/setup.py +++ b/vision/setup.py @@ -22,7 +22,7 @@ version = '0.34.0' release_status = 'Development Status :: 4 - Beta' dependencies = [ - 'google-api-core[grpc] >= 1.1.0, < 2.0.0dev', + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', 'enum34; python_version < "3.4"', ] diff --git a/websecurityscanner/setup.py b/websecurityscanner/setup.py index ad88bf21cad8..2d8f76b0a704 100644 --- a/websecurityscanner/setup.py +++ b/websecurityscanner/setup.py @@ -29,7 +29,7 @@ # 'Development Status :: 5 - Production/Stable' release_status = 'Development Status :: 3 - Alpha' dependencies = [ - 'google-api-core[grpc]>=1.0.0,<2.0.0' + 'google-api-core[grpc] >= 1.4.1, < 2.0.0dev', ] extras = {