From dbd453876ec65e9902faa9ff98d15e2a04ec6602 Mon Sep 17 00:00:00 2001
From: Dan Streetman <ddstreet@canonical.com>
Date: Fri, 4 Jun 2021 17:48:50 -0400
Subject: [PATCH] flake8 tests no longer need to specifically exclude
 ubuntu-archive-assistant

Now that ubuntu-archive-assistant is removed, we can simply test everything
with flake8
---
 debian/control       | 2 +-
 debian/rules         | 2 +-
 debian/tests/control | 4 ++--
 tox.ini              | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 6693c1f..33a5366 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  devscripts (>= 2.11.0~),
  dh-python,
  distro-info (>= 0.2~),
- flake8 (>= 3.8.0),
+ flake8,
  lsb-release,
  python3-all,
  python3-apt,
diff --git a/debian/rules b/debian/rules
index 8de7b4c..3af6a11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ override_dh_auto_clean:
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	flake8 -v --max-line-length=99 --extend-exclude=ubuntu-archive-assistant,ubuntu_archive_assistant
+	flake8 -v --max-line-length=99
 	nosetests3 -v ubuntutools
 endif
 
diff --git a/debian/tests/control b/debian/tests/control
index b6f0a10..0be1f25 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
-Test-Command: flake8 -v --max-line-length=99 --extend-exclude=ubuntu-archive-assistant,ubuntu_archive_assistant
+Test-Command: flake8 -v --max-line-length=99
 Depends:
- flake8 (>= 3.8.0),
+ flake8,
 Restrictions: allow-stderr
 
 Test-Command: nosetests3 -v ubuntutools
diff --git a/tox.ini b/tox.ini
index 74f956f..f9b13e2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,4 +20,3 @@ commands = nosetests -v --with-coverage --cover-package=ubuntutools {posargs:ubu
 [flake8]
 verbose = 2
 max-line-length = 99
-extend-exclude = ubuntu-archive-assistant,ubuntu_archive_assistant