Remove email-filter requirement
This option was deprecated.
Change-Id: Idd19278e22b3168dcd545901b8ca8bacb7599647
diff --git a/doc/source/user/config.rst b/doc/source/user/config.rst
index 2084c9c..362edad 100644
--- a/doc/source/user/config.rst
+++ b/doc/source/user/config.rst
@@ -263,11 +263,6 @@
If present, an approval with this email address is required. It
is treated as a regular expression.
- .. zuul:attr:: email-filter (deprecated)
-
- A deprecated alternate spelling of *email*. Only one of
- *email* or *email_filter* should be used.
-
.. zuul:attr:: older-than
If present, the approval must be older than this amount
diff --git a/zuul/configloader.py b/zuul/configloader.py
index 7640dfc..51949d4 100644
--- a/zuul/configloader.py
+++ b/zuul/configloader.py
@@ -763,7 +763,6 @@
precedence = vs.Any('normal', 'low', 'high')
approval = vs.Schema({'username': str,
- 'email-filter': str,
'email': str,
'older-than': str,
'newer-than': str,
diff --git a/zuul/driver/gerrit/gerritmodel.py b/zuul/driver/gerrit/gerritmodel.py
index 7c1bb5a..b96ed4c 100644
--- a/zuul/driver/gerrit/gerritmodel.py
+++ b/zuul/driver/gerrit/gerritmodel.py
@@ -71,14 +71,12 @@
for k, v in a.items():
if k == 'username':
a['username'] = re.compile(v)
- elif k in ['email', 'email-filter']:
+ elif k == 'email':
a['email'] = re.compile(v)
elif k == 'newer-than':
a[k] = time_to_seconds(v)
elif k == 'older-than':
a[k] = time_to_seconds(v)
- if 'email-filter' in a:
- del a['email-filter']
return approvals
def _match_approval_required_approval(self, rapproval, approval):
diff --git a/zuul/driver/gerrit/gerritsource.py b/zuul/driver/gerrit/gerritsource.py
index 4571cc1..e41859e 100644
--- a/zuul/driver/gerrit/gerritsource.py
+++ b/zuul/driver/gerrit/gerritsource.py
@@ -82,7 +82,6 @@
approval = vs.Schema({'username': str,
- 'email-filter': str,
'email': str,
'older-than': str,
'newer-than': str,
diff --git a/zuul/driver/gerrit/gerrittrigger.py b/zuul/driver/gerrit/gerrittrigger.py
index 706b7df..cfedd4e 100644
--- a/zuul/driver/gerrit/gerrittrigger.py
+++ b/zuul/driver/gerrit/gerrittrigger.py
@@ -77,7 +77,6 @@
variable_dict = v.Schema(dict)
approval = v.Schema({'username': str,
- 'email-filter': str,
'email': str,
'older-than': str,
'newer-than': str,
diff --git a/zuul/driver/zuul/zuultrigger.py b/zuul/driver/zuul/zuultrigger.py
index 628687e..09125f2 100644
--- a/zuul/driver/zuul/zuultrigger.py
+++ b/zuul/driver/zuul/zuultrigger.py
@@ -44,7 +44,6 @@
def getSchema():
approval = v.Schema({'username': str,
- 'email-filter': str,
'email': str,
'older-than': str,
'newer-than': str,