tooling: Add requirements.in and rationalize deps

Signed-off-by: Ryan Northey <[email protected]>
envoyproxy · Sep 3, 2021 · 19c7645 · 19c7645
1 parent 63d9858
commit 19c7645
Show file tree

Hide file tree

Showing 35 changed files with 273 additions and 803 deletions.
diff --git a/.github/actions/pr_notifier/requirements.in b/.github/actions/pr_notifier/requirements.in
@@ -0,0 +1,2 @@
+pygithub
+slack_sdk
diff --git a/.github/actions/pr_notifier/requirements.txt b/.github/actions/pr_notifier/requirements.txt
@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --generate-hashes .github/actions/pr_notifier/requirements.txt
+#    pip-compile --generate-hashes .github/actions/pr_notifier/requirements.in
 #
 certifi==2021.5.30 \
     --hash=sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee \
@@ -78,7 +78,7 @@ pycparser==2.20 \
 pygithub==1.55 \
     --hash=sha256:1bbfff9372047ff3f21d5cd8e07720f3dbfdaf6462fcaed9d815f528f1ba7283 \
     --hash=sha256:2caf0054ea079b71e539741ae56c5a95e073b81fa472ce222e81667381b9601b
-    # via -r .github/actions/pr_notifier/requirements.txt
+    # via -r .github/actions/pr_notifier/requirements.in
 pyjwt==2.1.0 \
     --hash=sha256:934d73fbba91b0483d3857d1aff50e96b2a892384ee2c17417ed3203f173fca1 \
     --hash=sha256:fba44e7898bbca160a2b2b501f492824fc8382485d3a6f11ba5d0c1937ce6130
@@ -112,9 +112,9 @@ six==1.16.0 \
     --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
     # via pynacl
 slack-sdk==3.10.1 \
-    --hash=sha256:f17b71a578e94204d9033bffded634475f4ca0a6274c6c7a4fd8a9cb0ac7cd8b \
-    --hash=sha256:2b4dde7728eb4ff5a581025d204578ccff25a5d8f0fe11ae175e3ce6e074434f
-    # via -r .github/actions/pr_notifier/requirements.txt
+    --hash=sha256:2b4dde7728eb4ff5a581025d204578ccff25a5d8f0fe11ae175e3ce6e074434f \
+    --hash=sha256:f17b71a578e94204d9033bffded634475f4ca0a6274c6c7a4fd8a9cb0ac7cd8b
+    # via -r .github/actions/pr_notifier/requirements.in
 urllib3==1.26.6 \
     --hash=sha256:39fb8672126159acb139a7718dd10806104dec1e2f0f6c88aab05d17df10c8d4 \
     --hash=sha256:f57b4c16c62fa2760b7e3d97c35b255512fb6b59a259730f36ba32ce9f8e342f

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,11 +11,6 @@ updates:
   schedule:
     interval: "daily"
 
-- package-ecosystem: "pip"
-  directory: "/contrib/kafka/filters/network/source"
-  schedule:
-    interval: "daily"
-
 - package-ecosystem: "pip"
   directory: "/examples/grpc-bridge/client"
   schedule:
@@ -31,21 +26,6 @@ updates:
   schedule:
     interval: "daily"
 
-- package-ecosystem: "pip"
-  directory: "/tools/git"
-  schedule:
-    interval: "daily"
-
-- package-ecosystem: "pip"
-  directory: "/tools/config_validation"
-  schedule:
-    interval: "daily"
-
-- package-ecosystem: "pip"
-  directory: "/tools/dependency"
-  schedule:
-    interval: "daily"
-
 - package-ecosystem: "pip"
   directory: "/tools/deprecate_version"
   schedule:
@@ -56,16 +36,6 @@ updates:
   schedule:
     interval: "daily"
 
-- package-ecosystem: "pip"
-  directory: "/tools/protodoc"
-  schedule:
-    interval: "daily"
-
-- package-ecosystem: "pip"
-  directory: "/tools/deprecate_features"
-  schedule:
-    interval: "daily"
-
 - package-ecosystem: "pip"
   directory: "/tools/code_format"
   schedule:
@@ -76,11 +46,6 @@ updates:
   schedule:
     interval: "daily"
 
-- package-ecosystem: "pip"
-  directory: "/configs"
-  schedule:
-    interval: "daily"
-
 - package-ecosystem: "pip"
   directory: "/tools/testing"
   schedule:

diff --git a/bazel/repositories_extra.bzl b/bazel/repositories_extra.bzl
@@ -9,86 +9,16 @@ def _python_deps():
         requirements = "@envoy//tools/base:requirements.txt",
         extra_pip_args = ["--require-hashes"],
     )
-    pip_install(
-        name = "config_validation_pip3",
-        requirements = "@envoy//tools/config_validation:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-
-        # project_name = "PyYAML",
-        # project_url = "https://github.com/yaml/pyyaml",
-        # version = "5.4.1",
-        # release_date = "2021-01-20"
-        # use_category = ["devtools"],
-        # cpe = "cpe:2.3:a:pyyaml:pyyaml:*",
-    )
-    pip_install(
-        name = "configs_pip3",
-        requirements = "@envoy//configs:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-
-        # project_name = "Jinja",
-        # project_url = "http://palletsprojects.com/p/jinja",
-        # version = "2.11.2",
-        # release_date = "2020-04-13"
-        # use_category = ["test"],
-        # cpe = "cpe:2.3:a:palletsprojects:jinja:*",
-
-        # project_name = "MarkupSafe",
-        # project_url = "https://markupsafe.palletsprojects.com/en/1.1.x/",
-        # version = "1.1.1",
-        # release_date = "2019-02-23"
-        # use_category = ["test"],
-    )
     pip_install(
         name = "docs_pip3",
         requirements = "@envoy//tools/docs:requirements.txt",
         extra_pip_args = ["--require-hashes"],
     )
-    pip_install(
-        name = "deps_pip3",
-        requirements = "@envoy//tools/dependency:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-    )
     pip_install(
         name = "distribution_pip3",
         requirements = "@envoy//tools/distribution:requirements.txt",
         extra_pip_args = ["--require-hashes"],
     )
-    pip_install(
-        name = "git_pip3",
-        requirements = "@envoy//tools/git:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-    )
-    pip_install(
-        name = "kafka_pip3",
-        requirements = "@envoy//contrib/kafka/filters/network/source:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-
-        # project_name = "Jinja",
-        # project_url = "http://palletsprojects.com/p/jinja",
-        # version = "2.11.2",
-        # release_date = "2020-04-13"
-        # use_category = ["test"],
-        # cpe = "cpe:2.3:a:palletsprojects:jinja:*",
-
-        # project_name = "MarkupSafe",
-        # project_url = "https://markupsafe.palletsprojects.com/en/1.1.x/",
-        # version = "1.1.1",
-        # release_date = "2019-02-23"
-        # use_category = ["test"],
-    )
-    pip_install(
-        name = "protodoc_pip3",
-        requirements = "@envoy//tools/protodoc:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
-
-        # project_name = "PyYAML",
-        # project_url = "https://github.com/yaml/pyyaml",
-        # version = "5.4.1",
-        # release_date = "2021-01-20"
-        # use_category = ["docs"],
-        # cpe = "cpe:2.3:a:pyyaml:pyyaml:*",
-    )
     pip_install(
         name = "pylint_pip3",
         requirements = "@envoy//tools/code_format:requirements.txt",