Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,6 @@ updates:
schedule:
interval: "daily"

- package-ecosystem: "pip"
directory: "/tools/deprecate_features"
schedule:
interval: "daily"

- package-ecosystem: "pip"
directory: "/tools/deprecate_version"
schedule:
interval: "daily"

- package-ecosystem: "pip"
directory: "/ci/flaky_test"
schedule:
Expand Down
2 changes: 1 addition & 1 deletion GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ New Features
Deprecated
----------
```
* Run the deprecate_versions.py script (e.g. `sh tools/deprecate_version/deprecate_version.sh`)
* Run the deprecate_versions.py script (e.g. `bazel run //tools/deprecate_version:deprecate_version`)
to file tracking issues for runtime guarded code which can be removed.
* Check source/common/runtime/runtime_features.cc and see if any runtime guards in
disabled_runtime_features should be reassessed, and ping on the relevant issues.
Expand Down
9 changes: 9 additions & 0 deletions tools/deprecate_features/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
load("@rules_python//python:defs.bzl", "py_binary")

licenses(["notice"]) # Apache 2

py_binary(
name = "deprecate_features",
srcs = ["deprecate_features.py"],
deps = ["@envoy_repo"],
)
6 changes: 4 additions & 2 deletions tools/deprecate_features/deprecate_features.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
import re
import subprocess
import fileinput
from six.moves import input

import envoy_repo


# Sorts out the list of deprecated proto fields which should be disallowed and returns a tuple of
# email and code changes.
def deprecate_proto():
grep_output = subprocess.check_output('grep -r "deprecated = true" api/*', shell=True)
grep_output = subprocess.check_output(
'grep -r "deprecated = true" api/*', shell=True, cwd=envoy_repo.PATH)

filenames_and_fields = set()

Expand Down
7 changes: 0 additions & 7 deletions tools/deprecate_features/deprecate_features.sh

This file was deleted.

3 changes: 0 additions & 3 deletions tools/deprecate_features/requirements.txt

This file was deleted.

13 changes: 13 additions & 0 deletions tools/deprecate_version/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
load("@rules_python//python:defs.bzl", "py_binary")
load("@base_pip3//:requirements.bzl", "requirement")

licenses(["notice"]) # Apache 2

py_binary(
name = "deprecate_version",
srcs = ["deprecate_version.py"],
deps = [
requirement("gitpython"),
requirement("pygithub"),
],
)
12 changes: 2 additions & 10 deletions tools/deprecate_version/deprecate_version.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
# Script for automating cleanup PR creation for deprecated runtime features
# Bazel usage
#
# sh tools/deprecate_version/deprecate_version.sh
#
# Direct usage (not recommended):
#
# python tools/deprecate_version/deprecate_version.py
#
# e.g
#
# python tools/deprecate_version/deprecate_version.py
# bazel run //tools/deprecate_version:deprecate_version
#
# A GitHub access token must be set in GITHUB_TOKEN. To create one, go to
# Settings -> Developer settings -> Personal access tokens in GitHub and create
Expand Down
7 changes: 0 additions & 7 deletions tools/deprecate_version/deprecate_version.sh

This file was deleted.

138 changes: 0 additions & 138 deletions tools/deprecate_version/requirements.txt

This file was deleted.