Merge bileto:drop-obsolete-series into bileto:master

[Steve Langasek]

[Łukasz Zemczak (sil2100)]

This is good, but needs some additional changes. Right now the tests are failing as there are places where SERIES is still referenced.

But I'll fix that.

review: Needs Fixing

[Łukasz Zemczak (sil2100)]

review: Approve

diff --git a/bileto/v2.py b/bileto/v2.py
index b6a3c3c..a6cc3e7 100644
--- a/bileto/v2.py
+++ b/bileto/v2.py
@@ -34,12 +34,6 @@ FAILURES = ('can\'t', 'caught', 'error', 'exception',
 EXPAND = {'search'}
 CONTRACT = EXPAND | {'comments', 'merge_proposals'}
 SLASH = '/'
-SERIES = [
-    'zesty-overlay, xenial-overlay',
-    'zesty, xenial-overlay',
-    'zesty, yakkety',
-    'zesty, yakkety, xenial',
-]
 
 
 def assert_json():
@@ -195,7 +189,7 @@ def v2_metadata_get():
             lander_signoff=signoff,
             qa_signoff=['Ready'] + signoff,
             distribution=['ubuntu'],
-            series=SERIES + series,
+            series=series,
             dest=['', '{}/ubuntu/stable-phone-overlay'.format(team)],
             status=(
                 'New',
diff --git a/tests/test_v2.py b/tests/test_v2.py
index 412c844..0a56d44 100644
--- a/tests/test_v2.py
+++ b/tests/test_v2.py
@@ -12,7 +12,6 @@ from mock import patch
 
 from bileto.models import Ticket, Comment
 from bileto.app import db
-from bileto.v2 import SERIES
 
 from tests.tests import BiletoTestCase
 
@@ -631,7 +630,7 @@ class V2TestCase(BiletoTestCase):
                 distribution=['ubuntu'],
                 lander_signoff=['', 'Approved', 'Failed'],
                 qa_signoff=['Ready', '', 'Approved', 'Failed'],
-                series=SERIES + ['alpha', 'beta'],
+                series=['alpha', 'beta'],
                 status=['New', 'Landed', 'Abandoned']),
             ppa_team='team-not-set',
             devel='alpha',