From e66cd1aaaba900d9638db4abce8ceaf2c86dce57 Mon Sep 17 00:00:00 2001 From: Red Daly Date: Thu, 15 Aug 2024 12:31:59 -0700 Subject: [PATCH] Update module and dockerfile in response to pr comments about build failure and protobuf version --- MODULE.bazel | 4 +- MODULE.bazel.lock | 315 +-------------------- net/grpc/gateway/docker/prereqs/Dockerfile | 3 +- 3 files changed, 9 insertions(+), 313 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index d44cab2..1149db0 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,11 +1,11 @@ module( name = "grpc-web", - version = "1.6.0.rc1", + version = "1.6.0", compatibility_level = 1, repo_name = "com_github_grpc_grpc_web", ) -bazel_dep(name = "protobuf", version = "23.1", repo_name = "com_google_protobuf") +bazel_dep(name = "protobuf", version = "27.1", repo_name = "com_google_protobuf") bazel_dep(name = "grpc", version = "1.65.0", repo_name = "com_github_grpc_grpc") bazel_dep(name = "rules_cc", version = "0.0.2") bazel_dep(name = "rules_proto", version = "6.0.2") diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 543dfe2..e96b7d5 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -508,7 +508,7 @@ }, "@@rules_apple~//apple:apple.bzl%provisioning_profile_repository_extension": { "general": { - "bzlTransitiveDigest": "nulgePI74J7Pg5hKSKbqd6mcPFAIJjFrGnsqWQF6Ro4=", + "bzlTransitiveDigest": "dXWLq4QKfujZK2DictEwIMIDb5xT/3rruqSdxa+qPRY=", "usagesDigest": "UhBm5PZa1fF3JVvE+MP5KJ54NVoMseygsrNckeQsUag=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -2516,11 +2516,10 @@ }, "@@rules_python~//python/extensions:pip.bzl%pip": { "os:linux,arch:amd64": { - "bzlTransitiveDigest": "4nW0g2UaYfybw1MR57a0gRQUZlRK2KGoXH5fYL0XcR8=", - "usagesDigest": "WdA5zEjSFz/wltsXIgxvRGl8CCw54bawoU2cn+bNFaY=", + "bzlTransitiveDigest": "QhlE4oAiUTmZpU/R7wkfULkR6ScBnoXK6xUEhktgdvs=", + "usagesDigest": "7bDp5qn8YPu+LI0vZd8LcFak+A0bAHUNPQiqn4GaAmg=", "recordedFileInputs": { - "@@grpc~//requirements.bazel.txt": "c43a56443ad71bd3b700cc3f4e889e1fd7516c2deddb6e9b75f40194bc92bf1c", - "@@protobuf~//python/requirements.txt": "2e925031e9c1de6b673ed19858dee0af57a7c06d5c4f94ffefd6822ccda584ea" + "@@grpc~//requirements.bazel.txt": "c43a56443ad71bd3b700cc3f4e889e1fd7516c2deddb6e9b75f40194bc92bf1c" }, "recordedDirentsInputs": {}, "envVariables": {}, @@ -2813,30 +2812,6 @@ "group_deps": [] } }, - "pip_deps_311_numpy": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "whl_library", - "attributes": { - "requirement": "numpy<=1.26.1", - "repo": "pip_deps_311", - "repo_prefix": "pip_deps_311_", - "whl_patches": {}, - "experimental_target_platforms": [], - "python_interpreter": "", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "quiet": true, - "timeout": 600, - "isolated": true, - "extra_pip_args": [], - "download_only": false, - "pip_data_exclude": [], - "enable_implicit_namespace_pkgs": false, - "environment": {}, - "envsubst": [], - "group_name": "", - "group_deps": [] - } - }, "grpc_python_dependencies_39_cachetools": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -3197,14 +3172,6 @@ "group_deps": [] } }, - "pip_deps_312__groups": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "group_library", - "attributes": { - "repo_prefix": "pip_deps_312_", - "groups": {} - } - }, "grpc_python_dependencies_38_google_auth": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -3957,54 +3924,6 @@ "group_deps": [] } }, - "pip_deps_39_setuptools": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "whl_library", - "attributes": { - "requirement": "setuptools<=68.2.2", - "repo": "pip_deps_39", - "repo_prefix": "pip_deps_39_", - "whl_patches": {}, - "experimental_target_platforms": [], - "python_interpreter": "", - "python_interpreter_target": "@@rules_python~~python~python_3_9_host//:python", - "quiet": true, - "timeout": 600, - "isolated": true, - "extra_pip_args": [], - "download_only": false, - "pip_data_exclude": [], - "enable_implicit_namespace_pkgs": false, - "environment": {}, - "envsubst": [], - "group_name": "", - "group_deps": [] - } - }, - "pip_deps": { - "bzlFile": "@@rules_python~//python/private/bzlmod:pip_repository.bzl", - "ruleClassName": "pip_repository", - "attributes": { - "repo_name": "pip_deps", - "whl_map": { - "numpy": [ - "3.8", - "3.9", - "3.10", - "3.11", - "3.12" - ], - "setuptools": [ - "3.8", - "3.9", - "3.10", - "3.11", - "3.12" - ] - }, - "default_version": "3.11" - } - }, "grpc_python_dependencies_39_pyasn1": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -4125,30 +4044,6 @@ "group_deps": [] } }, - "pip_deps_311_setuptools": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "whl_library", - "attributes": { - "requirement": "setuptools<=68.2.2", - "repo": "pip_deps_311", - "repo_prefix": "pip_deps_311_", - "whl_patches": {}, - "experimental_target_platforms": [], - "python_interpreter": "", - "python_interpreter_target": "@@rules_python~~python~python_3_11_host//:python", - "quiet": true, - "timeout": 600, - "isolated": true, - "extra_pip_args": [], - "download_only": false, - "pip_data_exclude": [], - "enable_implicit_namespace_pkgs": false, - "environment": {}, - "envsubst": [], - "group_name": "", - "group_deps": [] - } - }, "grpc_python_dependencies_312_gevent": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -4173,14 +4068,6 @@ "group_deps": [] } }, - "pip_deps_311__groups": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "group_library", - "attributes": { - "repo_prefix": "pip_deps_311_", - "groups": {} - } - }, "grpc_python_dependencies_310_zope_event": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -5109,30 +4996,6 @@ "group_deps": [] } }, - "pip_deps_312_setuptools": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "whl_library", - "attributes": { - "requirement": "setuptools<=68.2.2", - "repo": "pip_deps_312", - "repo_prefix": "pip_deps_312_", - "whl_patches": {}, - "experimental_target_platforms": [], - "python_interpreter": "", - "python_interpreter_target": "@@rules_python~~python~python_3_12_host//:python", - "quiet": true, - "timeout": 600, - "isolated": true, - "extra_pip_args": [], - "download_only": false, - "pip_data_exclude": [], - "enable_implicit_namespace_pkgs": false, - "environment": {}, - "envsubst": [], - "group_name": "", - "group_deps": [] - } - }, "grpc_python_dependencies_312_typing_extensions": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -5920,30 +5783,6 @@ "group_deps": [] } }, - "pip_deps_38_setuptools": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "whl_library", - "attributes": { - "requirement": "setuptools<=68.2.2", - "repo": "pip_deps_38", - "repo_prefix": "pip_deps_38_", - "whl_patches": {}, - "experimental_target_platforms": [], - "python_interpreter": "", - "python_interpreter_target": "@@rules_python~~python~python_3_8_host//:python", - "quiet": true, - "timeout": 600, - "isolated": true, - "extra_pip_args": [], - "download_only": false, - "pip_data_exclude": [], - "enable_implicit_namespace_pkgs": false, - "environment": {}, - "envsubst": [], - "group_name": "", - "group_deps": [] - } - }, "grpc_python_dependencies_310_opentelemetry_semantic_conventions": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -6064,30 +5903,6 @@ "group_deps": [] } }, - "pip_deps_39_numpy": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "whl_library", - "attributes": { - "requirement": "numpy<=1.26.1", - "repo": "pip_deps_39", - "repo_prefix": "pip_deps_39_", - "whl_patches": {}, - "experimental_target_platforms": [], - "python_interpreter": "", - "python_interpreter_target": "@@rules_python~~python~python_3_9_host//:python", - "quiet": true, - "timeout": 600, - "isolated": true, - "extra_pip_args": [], - "download_only": false, - "pip_data_exclude": [], - "enable_implicit_namespace_pkgs": false, - "environment": {}, - "envsubst": [], - "group_name": "", - "group_deps": [] - } - }, "grpc_python_dependencies_310_zipp": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -6256,30 +6071,6 @@ "group_deps": [] } }, - "pip_deps_38_numpy": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "whl_library", - "attributes": { - "requirement": "numpy<=1.26.1", - "repo": "pip_deps_38", - "repo_prefix": "pip_deps_38_", - "whl_patches": {}, - "experimental_target_platforms": [], - "python_interpreter": "", - "python_interpreter_target": "@@rules_python~~python~python_3_8_host//:python", - "quiet": true, - "timeout": 600, - "isolated": true, - "extra_pip_args": [], - "download_only": false, - "pip_data_exclude": [], - "enable_implicit_namespace_pkgs": false, - "environment": {}, - "envsubst": [], - "group_name": "", - "group_deps": [] - } - }, "grpc_python_dependencies_38_certifi": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -6304,14 +6095,6 @@ "group_deps": [] } }, - "pip_deps_39__groups": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "group_library", - "attributes": { - "repo_prefix": "pip_deps_39_", - "groups": {} - } - }, "grpc_python_dependencies_38_zipp": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -6384,30 +6167,6 @@ "group_deps": [] } }, - "pip_deps_310_numpy": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "whl_library", - "attributes": { - "requirement": "numpy<=1.26.1", - "repo": "pip_deps_310", - "repo_prefix": "pip_deps_310_", - "whl_patches": {}, - "experimental_target_platforms": [], - "python_interpreter": "", - "python_interpreter_target": "@@rules_python~~python~python_3_10_host//:python", - "quiet": true, - "timeout": 600, - "isolated": true, - "extra_pip_args": [], - "download_only": false, - "pip_data_exclude": [], - "enable_implicit_namespace_pkgs": false, - "environment": {}, - "envsubst": [], - "group_name": "", - "group_deps": [] - } - }, "grpc_python_dependencies_39_coverage": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -6504,14 +6263,6 @@ "group_deps": [] } }, - "pip_deps_38__groups": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "group_library", - "attributes": { - "repo_prefix": "pip_deps_38_", - "groups": {} - } - }, "grpc_python_dependencies_38_opentelemetry_sdk": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -7024,30 +6775,6 @@ "group_deps": [] } }, - "pip_deps_310_setuptools": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "whl_library", - "attributes": { - "requirement": "setuptools<=68.2.2", - "repo": "pip_deps_310", - "repo_prefix": "pip_deps_310_", - "whl_patches": {}, - "experimental_target_platforms": [], - "python_interpreter": "", - "python_interpreter_target": "@@rules_python~~python~python_3_10_host//:python", - "quiet": true, - "timeout": 600, - "isolated": true, - "extra_pip_args": [], - "download_only": false, - "pip_data_exclude": [], - "enable_implicit_namespace_pkgs": false, - "environment": {}, - "envsubst": [], - "group_name": "", - "group_deps": [] - } - }, "grpc_python_dependencies_38_pyasn1_modules": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -7288,30 +7015,6 @@ "group_deps": [] } }, - "pip_deps_312_numpy": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "whl_library", - "attributes": { - "requirement": "numpy<=1.26.1", - "repo": "pip_deps_312", - "repo_prefix": "pip_deps_312_", - "whl_patches": {}, - "experimental_target_platforms": [], - "python_interpreter": "", - "python_interpreter_target": "@@rules_python~~python~python_3_12_host//:python", - "quiet": true, - "timeout": 600, - "isolated": true, - "extra_pip_args": [], - "download_only": false, - "pip_data_exclude": [], - "enable_implicit_namespace_pkgs": false, - "environment": {}, - "envsubst": [], - "group_name": "", - "group_deps": [] - } - }, "grpc_python_dependencies_312_pyasn1_modules": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -7560,14 +7263,6 @@ "group_deps": [] } }, - "pip_deps_310__groups": { - "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", - "ruleClassName": "group_library", - "attributes": { - "repo_prefix": "pip_deps_310_", - "groups": {} - } - }, "grpc_python_dependencies_311_wheel": { "bzlFile": "@@rules_python~//python/pip_install:pip_repository.bzl", "ruleClassName": "whl_library", @@ -7995,7 +7690,7 @@ "@@rules_python~//python/extensions:python.bzl%python": { "general": { "bzlTransitiveDigest": "uHZmn4VCpelMhuk7Rz8Q5oK94ttURW5KkyvXa6hRTfk=", - "usagesDigest": "n4wazdCkxpvVxDmVoKfG479dpWhgCbn/+j22NF5QdQ4=", + "usagesDigest": "G8bGm0r/hf8rSY7NmzCw5Tu5qYC4ee63d/UZ8gvVyJ0=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": { diff --git a/net/grpc/gateway/docker/prereqs/Dockerfile b/net/grpc/gateway/docker/prereqs/Dockerfile index 34a1a94..0f1ca99 100644 --- a/net/grpc/gateway/docker/prereqs/Dockerfile +++ b/net/grpc/gateway/docker/prereqs/Dockerfile @@ -74,7 +74,8 @@ WORKDIR /github/grpc-web # Copy only files necessary to build the protoc-gen-grpc-web first as an optimization because they # are rarely updated compared with the javascript files. -COPY ./WORKSPACE ./WORKSPACE +COPY ./MODULE.bazel ./MODULE.bazel +COPY ./MODULE.bazel.lock ./MODULE.bazel.lock COPY ./.bazelrc ./.bazelrc COPY ./javascript/net/grpc/web/generator javascript/net/grpc/web/generator