diff --git a/gapic/templates/testing/_default_constraints.j2 b/gapic/templates/testing/_default_constraints.j2 index 19da09d537..85d819aaff 100644 --- a/gapic/templates/testing/_default_constraints.j2 +++ b/gapic/templates/testing/_default_constraints.j2 @@ -6,6 +6,8 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography {% for package_tuple, package_info in pypi_packages.items() %} {# Quick check to make sure `package_info.package_name` is not the package being generated so we don't circularly include this package in its own constraints file. #} {% if api.naming.warehouse_package_name != package_info.package_name %} diff --git a/gapic/templates/testing/constraints-3.7.txt.j2 b/gapic/templates/testing/constraints-3.7.txt.j2 index d6d5cd5dd3..7f13988b11 100644 --- a/gapic/templates/testing/constraints-3.7.txt.j2 +++ b/gapic/templates/testing/constraints-3.7.txt.j2 @@ -7,6 +7,8 @@ # Then this file should have google-cloud-foo==1.14.0 google-api-core==1.34.1 google-auth==2.14.1 +# cryptography is a direct dependency of google-auth +cryptography==38.0.3 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453) # Add the minimum supported version of grpcio to constraints files proto-plus==1.22.3 diff --git a/tests/integration/goldens/asset/testing/constraints-3.10.txt b/tests/integration/goldens/asset/testing/constraints-3.10.txt index 763d545abe..c5602c5029 100755 --- a/tests/integration/goldens/asset/testing/constraints-3.10.txt +++ b/tests/integration/goldens/asset/testing/constraints-3.10.txt @@ -6,6 +6,8 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography google-cloud-access-context-manager google-cloud-os-config grpc-google-iam-v1 diff --git a/tests/integration/goldens/asset/testing/constraints-3.11.txt b/tests/integration/goldens/asset/testing/constraints-3.11.txt index 763d545abe..c5602c5029 100755 --- a/tests/integration/goldens/asset/testing/constraints-3.11.txt +++ b/tests/integration/goldens/asset/testing/constraints-3.11.txt @@ -6,6 +6,8 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography google-cloud-access-context-manager google-cloud-os-config grpc-google-iam-v1 diff --git a/tests/integration/goldens/asset/testing/constraints-3.12.txt b/tests/integration/goldens/asset/testing/constraints-3.12.txt index 763d545abe..c5602c5029 100755 --- a/tests/integration/goldens/asset/testing/constraints-3.12.txt +++ b/tests/integration/goldens/asset/testing/constraints-3.12.txt @@ -6,6 +6,8 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography google-cloud-access-context-manager google-cloud-os-config grpc-google-iam-v1 diff --git a/tests/integration/goldens/asset/testing/constraints-3.7.txt b/tests/integration/goldens/asset/testing/constraints-3.7.txt index 45771b18c6..1cf233cc71 100755 --- a/tests/integration/goldens/asset/testing/constraints-3.7.txt +++ b/tests/integration/goldens/asset/testing/constraints-3.7.txt @@ -6,6 +6,8 @@ # Then this file should have google-cloud-foo==1.14.0 google-api-core==1.34.1 google-auth==2.14.1 +# cryptography is a direct dependency of google-auth +cryptography==38.0.3 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453) # Add the minimum supported version of grpcio to constraints files proto-plus==1.22.3 diff --git a/tests/integration/goldens/asset/testing/constraints-3.8.txt b/tests/integration/goldens/asset/testing/constraints-3.8.txt index 763d545abe..c5602c5029 100755 --- a/tests/integration/goldens/asset/testing/constraints-3.8.txt +++ b/tests/integration/goldens/asset/testing/constraints-3.8.txt @@ -6,6 +6,8 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography google-cloud-access-context-manager google-cloud-os-config grpc-google-iam-v1 diff --git a/tests/integration/goldens/asset/testing/constraints-3.9.txt b/tests/integration/goldens/asset/testing/constraints-3.9.txt index 763d545abe..c5602c5029 100755 --- a/tests/integration/goldens/asset/testing/constraints-3.9.txt +++ b/tests/integration/goldens/asset/testing/constraints-3.9.txt @@ -6,6 +6,8 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography google-cloud-access-context-manager google-cloud-os-config grpc-google-iam-v1 diff --git a/tests/integration/goldens/credentials/testing/constraints-3.10.txt b/tests/integration/goldens/credentials/testing/constraints-3.10.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/credentials/testing/constraints-3.10.txt +++ b/tests/integration/goldens/credentials/testing/constraints-3.10.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/credentials/testing/constraints-3.11.txt b/tests/integration/goldens/credentials/testing/constraints-3.11.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/credentials/testing/constraints-3.11.txt +++ b/tests/integration/goldens/credentials/testing/constraints-3.11.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/credentials/testing/constraints-3.12.txt b/tests/integration/goldens/credentials/testing/constraints-3.12.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/credentials/testing/constraints-3.12.txt +++ b/tests/integration/goldens/credentials/testing/constraints-3.12.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/credentials/testing/constraints-3.7.txt b/tests/integration/goldens/credentials/testing/constraints-3.7.txt index 5d29dea386..bbf88e9745 100755 --- a/tests/integration/goldens/credentials/testing/constraints-3.7.txt +++ b/tests/integration/goldens/credentials/testing/constraints-3.7.txt @@ -6,6 +6,8 @@ # Then this file should have google-cloud-foo==1.14.0 google-api-core==1.34.1 google-auth==2.14.1 +# cryptography is a direct dependency of google-auth +cryptography==38.0.3 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453) # Add the minimum supported version of grpcio to constraints files proto-plus==1.22.3 diff --git a/tests/integration/goldens/credentials/testing/constraints-3.8.txt b/tests/integration/goldens/credentials/testing/constraints-3.8.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/credentials/testing/constraints-3.8.txt +++ b/tests/integration/goldens/credentials/testing/constraints-3.8.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/credentials/testing/constraints-3.9.txt b/tests/integration/goldens/credentials/testing/constraints-3.9.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/credentials/testing/constraints-3.9.txt +++ b/tests/integration/goldens/credentials/testing/constraints-3.9.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/eventarc/testing/constraints-3.10.txt b/tests/integration/goldens/eventarc/testing/constraints-3.10.txt index ef1c92ffff..1cd0c5a2c3 100755 --- a/tests/integration/goldens/eventarc/testing/constraints-3.10.txt +++ b/tests/integration/goldens/eventarc/testing/constraints-3.10.txt @@ -6,4 +6,6 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography grpc-google-iam-v1 diff --git a/tests/integration/goldens/eventarc/testing/constraints-3.11.txt b/tests/integration/goldens/eventarc/testing/constraints-3.11.txt index ef1c92ffff..1cd0c5a2c3 100755 --- a/tests/integration/goldens/eventarc/testing/constraints-3.11.txt +++ b/tests/integration/goldens/eventarc/testing/constraints-3.11.txt @@ -6,4 +6,6 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography grpc-google-iam-v1 diff --git a/tests/integration/goldens/eventarc/testing/constraints-3.12.txt b/tests/integration/goldens/eventarc/testing/constraints-3.12.txt index ef1c92ffff..1cd0c5a2c3 100755 --- a/tests/integration/goldens/eventarc/testing/constraints-3.12.txt +++ b/tests/integration/goldens/eventarc/testing/constraints-3.12.txt @@ -6,4 +6,6 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography grpc-google-iam-v1 diff --git a/tests/integration/goldens/eventarc/testing/constraints-3.7.txt b/tests/integration/goldens/eventarc/testing/constraints-3.7.txt index 5b1ee6c35a..9907cdc23b 100755 --- a/tests/integration/goldens/eventarc/testing/constraints-3.7.txt +++ b/tests/integration/goldens/eventarc/testing/constraints-3.7.txt @@ -6,6 +6,8 @@ # Then this file should have google-cloud-foo==1.14.0 google-api-core==1.34.1 google-auth==2.14.1 +# cryptography is a direct dependency of google-auth +cryptography==38.0.3 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453) # Add the minimum supported version of grpcio to constraints files proto-plus==1.22.3 diff --git a/tests/integration/goldens/eventarc/testing/constraints-3.8.txt b/tests/integration/goldens/eventarc/testing/constraints-3.8.txt index ef1c92ffff..1cd0c5a2c3 100755 --- a/tests/integration/goldens/eventarc/testing/constraints-3.8.txt +++ b/tests/integration/goldens/eventarc/testing/constraints-3.8.txt @@ -6,4 +6,6 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography grpc-google-iam-v1 diff --git a/tests/integration/goldens/eventarc/testing/constraints-3.9.txt b/tests/integration/goldens/eventarc/testing/constraints-3.9.txt index ef1c92ffff..1cd0c5a2c3 100755 --- a/tests/integration/goldens/eventarc/testing/constraints-3.9.txt +++ b/tests/integration/goldens/eventarc/testing/constraints-3.9.txt @@ -6,4 +6,6 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography grpc-google-iam-v1 diff --git a/tests/integration/goldens/logging/testing/constraints-3.10.txt b/tests/integration/goldens/logging/testing/constraints-3.10.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/logging/testing/constraints-3.10.txt +++ b/tests/integration/goldens/logging/testing/constraints-3.10.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/logging/testing/constraints-3.11.txt b/tests/integration/goldens/logging/testing/constraints-3.11.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/logging/testing/constraints-3.11.txt +++ b/tests/integration/goldens/logging/testing/constraints-3.11.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/logging/testing/constraints-3.12.txt b/tests/integration/goldens/logging/testing/constraints-3.12.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/logging/testing/constraints-3.12.txt +++ b/tests/integration/goldens/logging/testing/constraints-3.12.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/logging/testing/constraints-3.7.txt b/tests/integration/goldens/logging/testing/constraints-3.7.txt index 5d29dea386..bbf88e9745 100755 --- a/tests/integration/goldens/logging/testing/constraints-3.7.txt +++ b/tests/integration/goldens/logging/testing/constraints-3.7.txt @@ -6,6 +6,8 @@ # Then this file should have google-cloud-foo==1.14.0 google-api-core==1.34.1 google-auth==2.14.1 +# cryptography is a direct dependency of google-auth +cryptography==38.0.3 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453) # Add the minimum supported version of grpcio to constraints files proto-plus==1.22.3 diff --git a/tests/integration/goldens/logging/testing/constraints-3.8.txt b/tests/integration/goldens/logging/testing/constraints-3.8.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/logging/testing/constraints-3.8.txt +++ b/tests/integration/goldens/logging/testing/constraints-3.8.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/logging/testing/constraints-3.9.txt b/tests/integration/goldens/logging/testing/constraints-3.9.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/logging/testing/constraints-3.9.txt +++ b/tests/integration/goldens/logging/testing/constraints-3.9.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/logging_internal/testing/constraints-3.10.txt b/tests/integration/goldens/logging_internal/testing/constraints-3.10.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/logging_internal/testing/constraints-3.10.txt +++ b/tests/integration/goldens/logging_internal/testing/constraints-3.10.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/logging_internal/testing/constraints-3.11.txt b/tests/integration/goldens/logging_internal/testing/constraints-3.11.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/logging_internal/testing/constraints-3.11.txt +++ b/tests/integration/goldens/logging_internal/testing/constraints-3.11.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/logging_internal/testing/constraints-3.12.txt b/tests/integration/goldens/logging_internal/testing/constraints-3.12.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/logging_internal/testing/constraints-3.12.txt +++ b/tests/integration/goldens/logging_internal/testing/constraints-3.12.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/logging_internal/testing/constraints-3.7.txt b/tests/integration/goldens/logging_internal/testing/constraints-3.7.txt index 5d29dea386..bbf88e9745 100755 --- a/tests/integration/goldens/logging_internal/testing/constraints-3.7.txt +++ b/tests/integration/goldens/logging_internal/testing/constraints-3.7.txt @@ -6,6 +6,8 @@ # Then this file should have google-cloud-foo==1.14.0 google-api-core==1.34.1 google-auth==2.14.1 +# cryptography is a direct dependency of google-auth +cryptography==38.0.3 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453) # Add the minimum supported version of grpcio to constraints files proto-plus==1.22.3 diff --git a/tests/integration/goldens/logging_internal/testing/constraints-3.8.txt b/tests/integration/goldens/logging_internal/testing/constraints-3.8.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/logging_internal/testing/constraints-3.8.txt +++ b/tests/integration/goldens/logging_internal/testing/constraints-3.8.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/logging_internal/testing/constraints-3.9.txt b/tests/integration/goldens/logging_internal/testing/constraints-3.9.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/logging_internal/testing/constraints-3.9.txt +++ b/tests/integration/goldens/logging_internal/testing/constraints-3.9.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/redis/testing/constraints-3.10.txt b/tests/integration/goldens/redis/testing/constraints-3.10.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/redis/testing/constraints-3.10.txt +++ b/tests/integration/goldens/redis/testing/constraints-3.10.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/redis/testing/constraints-3.11.txt b/tests/integration/goldens/redis/testing/constraints-3.11.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/redis/testing/constraints-3.11.txt +++ b/tests/integration/goldens/redis/testing/constraints-3.11.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/redis/testing/constraints-3.12.txt b/tests/integration/goldens/redis/testing/constraints-3.12.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/redis/testing/constraints-3.12.txt +++ b/tests/integration/goldens/redis/testing/constraints-3.12.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/redis/testing/constraints-3.7.txt b/tests/integration/goldens/redis/testing/constraints-3.7.txt index 5d29dea386..bbf88e9745 100755 --- a/tests/integration/goldens/redis/testing/constraints-3.7.txt +++ b/tests/integration/goldens/redis/testing/constraints-3.7.txt @@ -6,6 +6,8 @@ # Then this file should have google-cloud-foo==1.14.0 google-api-core==1.34.1 google-auth==2.14.1 +# cryptography is a direct dependency of google-auth +cryptography==38.0.3 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453) # Add the minimum supported version of grpcio to constraints files proto-plus==1.22.3 diff --git a/tests/integration/goldens/redis/testing/constraints-3.8.txt b/tests/integration/goldens/redis/testing/constraints-3.8.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/redis/testing/constraints-3.8.txt +++ b/tests/integration/goldens/redis/testing/constraints-3.8.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/redis/testing/constraints-3.9.txt b/tests/integration/goldens/redis/testing/constraints-3.9.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/redis/testing/constraints-3.9.txt +++ b/tests/integration/goldens/redis/testing/constraints-3.9.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/redis_selective/testing/constraints-3.10.txt b/tests/integration/goldens/redis_selective/testing/constraints-3.10.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/redis_selective/testing/constraints-3.10.txt +++ b/tests/integration/goldens/redis_selective/testing/constraints-3.10.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/redis_selective/testing/constraints-3.11.txt b/tests/integration/goldens/redis_selective/testing/constraints-3.11.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/redis_selective/testing/constraints-3.11.txt +++ b/tests/integration/goldens/redis_selective/testing/constraints-3.11.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/redis_selective/testing/constraints-3.12.txt b/tests/integration/goldens/redis_selective/testing/constraints-3.12.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/redis_selective/testing/constraints-3.12.txt +++ b/tests/integration/goldens/redis_selective/testing/constraints-3.12.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/redis_selective/testing/constraints-3.7.txt b/tests/integration/goldens/redis_selective/testing/constraints-3.7.txt index 5d29dea386..bbf88e9745 100755 --- a/tests/integration/goldens/redis_selective/testing/constraints-3.7.txt +++ b/tests/integration/goldens/redis_selective/testing/constraints-3.7.txt @@ -6,6 +6,8 @@ # Then this file should have google-cloud-foo==1.14.0 google-api-core==1.34.1 google-auth==2.14.1 +# cryptography is a direct dependency of google-auth +cryptography==38.0.3 # TODO(https://github.com/googleapis/gapic-generator-python/issues/2453) # Add the minimum supported version of grpcio to constraints files proto-plus==1.22.3 diff --git a/tests/integration/goldens/redis_selective/testing/constraints-3.8.txt b/tests/integration/goldens/redis_selective/testing/constraints-3.8.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/redis_selective/testing/constraints-3.8.txt +++ b/tests/integration/goldens/redis_selective/testing/constraints-3.8.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography diff --git a/tests/integration/goldens/redis_selective/testing/constraints-3.9.txt b/tests/integration/goldens/redis_selective/testing/constraints-3.9.txt index 93e6826f2a..7599dea499 100755 --- a/tests/integration/goldens/redis_selective/testing/constraints-3.9.txt +++ b/tests/integration/goldens/redis_selective/testing/constraints-3.9.txt @@ -6,3 +6,5 @@ google-auth grpcio proto-plus protobuf +# cryptography is a direct dependency of google-auth +cryptography