Merge lp:~canonical-platform-qa/qakit/flake8-fixes into lp:~thomir/qakit/trunk

[Federico Gimenez]

Flake8 fixes

Flake8 fixes

[Leo Arias (elopio)]

review: Approve

[Vincent Ladeuil (vila)]

@Federico: Thanks for doing this !

Let's get those flake8 issues out of the way and automated asap.

I have a few questions/comments inline but nothing blocking this MP landing.

review: Approve

[Federico Gimenez (fgimenez)]

Hi Vincent, about the license boilerplate this is text that we are using in other projects like ubuntu-sanity-tests, ubuntu-power-tests and ubuntu-ota-tests, for instance [1]. It comes from the FSF recommendation at [2], but seems that we are using the one-file program recommendation for multi-file programs, we should discuss adopting the right one.

Thanks,

[1] http://bazaar.launchpad.net/~canonical-platform-qa/ubuntu-sanity-tests/trunk/view/head:/ubuntu_sanity_tests/selftests/__init__.py
[2] https://www.gnu.org/licenses/gpl-howto.html

Unmerged revisions

6. By Federico Gimenez on 2015-04-17

making flake8 happy

=== modified file 'qakit/__init__.py'
--- qakit/__init__.py	2014-10-08 01:30:28 +0000
+++ qakit/__init__.py	2015-04-17 14:40:43 +0000
@@ -12,8 +12,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
 
 
 __version__ = '0.1'

=== modified file 'qakit/commands.py'
--- qakit/commands.py	2014-11-12 02:33:22 +0000
+++ qakit/commands.py	2015-04-17 14:40:43 +0000
@@ -12,9 +12,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+# along with this program. If not, see <http://www.gnu.org/licenses/>
+#
 
 from argparse import ArgumentParser
 
@@ -23,6 +22,7 @@
     trello,
 )
 
+
 def main():
     """The main program entry point."""
     parser = ArgumentParser(
@@ -31,11 +31,12 @@
     subparsers = parser.add_subparsers(help="Commands", dest="command")
 
     subparsers.add_parser("silo-backlog", help="Show the current silo testing "
-        "backlog.")
-    subparsers.add_parser("silo-stats", help="Show statistics around completed "
-        "silo testing.")
+                          "backlog.")
+    subparsers.add_parser("silo-stats",
+                          help="Show statistics around completed "
+                          "silo testing.")
     subparsers.add_parser("silo-actions", help="Show statistics about overall "
-        "activity per person.")
+                          "activity per person.")
     subparsers.add_parser("project-backlog", help="Show project backlog")
     args = parser.parse_args()
     if args.command == 'silo-backlog':

=== modified file 'qakit/config.py'
--- qakit/config.py	2014-10-08 01:30:28 +0000
+++ qakit/config.py	2015-04-17 14:40:43 +0000
@@ -12,8 +12,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>
+#
 
 """Functions for configuration parsing."""
 

=== modified file 'qakit/format.py'
--- qakit/format.py	2014-10-09 00:52:51 +0000
+++ qakit/format.py	2015-04-17 14:40:43 +0000
@@ -12,9 +12,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+# along with this program. If not, see <http://www.gnu.org/licenses/>
+#
 
 "Format functions for output."
 from collections import defaultdict
@@ -37,6 +36,7 @@
     # 'color': 'grey'
 }
 
+
 def print_title(text):
     print(termcolor.colored(text, **_title_opts))
 
@@ -64,7 +64,7 @@
         if a.what not in fields:
             fields.append(a.what)
         if a.who not in people:
-            people[a.who] = {'updateCard':0, 'commentCard':0}
+            people[a.who] = {'updateCard': 0, 'commentCard': 0}
         if a.what not in people[a.who]:
             people[a.who][a.what] = 0
         people[a.who][a.what] += 1
@@ -75,9 +75,10 @@
     fields.remove('commentCard')
     fields.insert(2, 'commentCard')
 
-    foo = [(-v['updateCard'],-v['commentCard'],k,v) for k,v in people.items()]
+    foo = [(-v['updateCard'], -v['commentCard'], k, v)
+           for k, v in people.items()]
     foo.sort()
-    people = [(x[-2],x[-1]) for x in foo]
+    people = [(x[-2], x[-1]) for x in foo]
 
     tbl = prettytable.PrettyTable(fields)
     tbl.align["Name"] = 'l'
@@ -108,6 +109,7 @@
     _print_completed_table(cards, period)
     print("")
 
+
 class StatisticGroup(object):
 
     """Statistics are processed in groups.
@@ -173,15 +175,16 @@
 class SiloTesterStatisticGroup(StatisticGroup):
 
     """A statistic group that keep strack of how many silos each tester has
-    completed. This group yields data points equal to the number of silo testers
-    in the cards processed.
+    completed. This group yields data points equal to the number of silo
+    testers in the cards processed.
 
     """
     _statistics = {}
 
     def process_card(self, card, period):
         if card.assigned_to not in self._statistics:
-            self._statistics[card.assigned_to] = TesterCountStatistic(card.assigned_to)
+            self._statistics[card.assigned_to] = TesterCountStatistic(
+                card.assigned_to)
         self._statistics[card.assigned_to].process_card(card, period)
 
     def get_rows(self, *periods):
@@ -192,7 +195,8 @@
 
         """
         for s in self._statistics:
-            yield [s] + [self._statistics[s].result_for_period(p) for p in periods]
+            yield [s] + [self._statistics[s].result_for_period(p)
+                         for p in periods]
 
 
 class Statistic(object):
@@ -260,7 +264,8 @@
         percentage = ''
         if self._data[period]['total'] > 0:
             percentage = "(%.0f%%)" % (
-                self._data[period]['passed'] / self._data[period]['total'] * 100
+                self._data[period]['passed'] /
+                self._data[period]['total'] * 100
             )
         return "%d total, %d passed %s" % (
             self._data[period]['total'],
@@ -309,7 +314,8 @@
                     group.process_card(card, period)
 
     tbl = prettytable.PrettyTable(["Category"] + period_names)
-    tbl.add_row(["Period Starting"] + [p.start.strftime("%c") for p in periods])
+    tbl.add_row(["Period Starting"] +
+                [p.start.strftime("%c") for p in periods])
     for group in stat_groups:
         for row in group.get_rows(*periods):
             tbl.add_row(row)

=== modified file 'qakit/lkkb.py'
--- qakit/lkkb.py	2014-11-12 02:33:22 +0000
+++ qakit/lkkb.py	2015-04-17 14:40:43 +0000
@@ -12,16 +12,15 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-
+# along with this program. If not, see <http://www.gnu.org/licenses/>
+#
+
+from bs4 import BeautifulSoup
 from ConfigParser import RawConfigParser
 import os.path
 import sys
 import csv
 import requests
-from pprint import pprint
 import bleach
 
 
@@ -39,7 +38,8 @@
         resp.raise_for_status()
         data = resp.json()
         (sorted_lane,) = [
-            l for l in data[u'ReplyData'][0][u'Backlog'] if l[u'Title'] == u'Sorted'
+            l for l in data[u'ReplyData'][0][u'Backlog']
+            if l[u'Title'] == u'Sorted'
         ]
 
         row_keys = [
@@ -52,7 +52,7 @@
         csv_writer = csv.writer(sys.stdout)
         csv_writer.writerow(row_keys)
         for card in sorted_lane['Cards']:
-            row = [ clean_text(card[k]) for k in row_keys]
+            row = [clean_text(card[k]) for k in row_keys]
             csv_writer.writerow(row)
     except IOError:
         handle_file_read_error()
@@ -92,9 +92,11 @@
         raise IOError("Could not read file %s" % (config_file_path))
     if not parser.has_section("LeanKit"):
         raise ValueError("Could not find 'LeanKit' section in config file.")
-    if not parser.has_option("LeanKit", "Username") or not parser.get("LeanKit", "Username"):
+    if not parser.has_option("LeanKit", "Username") or \
+       not parser.get("LeanKit", "Username"):
         raise ValueError("No username set in config file.")
-    if not parser.has_option("LeanKit", "Password") or not parser.get("LeanKit", "Password"):
+    if not parser.has_option("LeanKit", "Password") or \
+       not parser.get("LeanKit", "Password"):
         raise ValueError("No password set in config file.")
     return (
         parser.get("LeanKit", "Username"),

=== modified file 'qakit/tests/__init__.py'
--- qakit/tests/__init__.py	2014-11-12 02:33:22 +0000
+++ qakit/tests/__init__.py	2015-04-17 14:40:43 +0000
@@ -12,9 +12,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+# along with this program. If not, see <http://www.gnu.org/licenses/>
+#
 
 from unittest import TestSuite
 

=== modified file 'qakit/tests/test_config.py'
--- qakit/tests/test_config.py	2014-10-08 01:30:28 +0000
+++ qakit/tests/test_config.py	2015-04-17 14:40:43 +0000
@@ -12,9 +12,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+# along with this program. If not, see <http://www.gnu.org/licenses/>
+#
 
 import os.path
 
@@ -39,7 +38,6 @@
         )
 
 
-
 def test_suite():
     from unittest import TestLoader
     return TestLoader().loadTestsFromName(__name__)

=== modified file 'qakit/tests/test_format.py'
--- qakit/tests/test_format.py	2014-10-08 01:30:28 +0000
+++ qakit/tests/test_format.py	2015-04-17 14:40:43 +0000
@@ -12,9 +12,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+# along with this program. If not, see <http://www.gnu.org/licenses/>
+#
 
 import datetime
 
@@ -38,13 +37,13 @@
     dt2 = dt1 + datetime.timedelta(days=1)
     return _f.Period(dt1, dt2)
 
+
 class FormatPeriodTests(TestCase):
 
-
     def test_can_construct_with_two_dates(self):
         dt1 = get_today_utc()
         dt2 = dt1 + datetime.timedelta(days=1)
-        p = _f.Period(dt1, dt2)
+        _f.Period(dt1, dt2)
 
     def test_raises_ValueError_if_start_after_end(self):
         dt1 = get_today_utc()
@@ -58,7 +57,7 @@
 
     def test_can_construct_with_same_date(self):
         dt1 = get_today_utc()
-        p = _f.Period(dt1, dt1)
+        _f.Period(dt1, dt1)
 
     def test_period_includes_start_date(self):
         p = make_period_with_one_day_duration()

=== modified file 'qakit/tests/test_trello.py'
--- qakit/tests/test_trello.py	2014-10-08 01:30:28 +0000
+++ qakit/tests/test_trello.py	2015-04-17 14:40:43 +0000
@@ -12,11 +12,9 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-
-from functools import partial
+# along with this program. If not, see <http://www.gnu.org/licenses/>
+#
+
 from testtools import TestCase
 
 from qakit import trello
@@ -32,7 +30,6 @@
     return trello.CompletedCard('Failed', date, assigned_to, name)
 
 
-
 class OpenCardFilterTests(TestCase):
 
     def test_no_backlog(self):

=== modified file 'qakit/trello.py'
--- qakit/trello.py	2014-10-09 00:52:51 +0000
+++ qakit/trello.py	2015-04-17 14:40:43 +0000
@@ -12,23 +12,19 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
+# along with this program. If not, see <http://www.gnu.org/licenses/>
+#
 
 """Functions for trello integration."""
 
 from __future__ import absolute_import
-
 import dateutil.parser
-
 import trello
-
 from qakit import format
 
 # some constants:
-TRELLO_API_KEY='52459e89f279d1dd916ffc65d324ce7c'
-TRELLO_SILO_TEST_BOARD='AE3swczu'
+TRELLO_API_KEY = '52459e89f279d1dd916ffc65d324ce7c'
+TRELLO_SILO_TEST_BOARD = 'AE3swczu'
 
 
 class Card(object):
@@ -89,7 +85,7 @@
 
 
 def test():
-    api = trello.TrelloApi(TRELLO_API_KEY)
+    trello.TrelloApi(TRELLO_API_KEY)
 
 
 def _get_all_completed_cards(trello_api):
@@ -121,7 +117,6 @@
 
 
 def _get_all_actions(trello_api):
-    actions = []
     raw_actions = trello_api.boards.get_action(
         TRELLO_SILO_TEST_BOARD,
         limit=1000
@@ -136,8 +131,8 @@
         act = action[u'type']
 
         # skip a few action types
-        if act in ('createCard','deleteCard','removeMemberFromCard',
-                'updateBoard',):
+        if act in ('createCard', 'deleteCard', 'removeMemberFromCard',
+                   'updateBoard',):
             continue
         # ignore updates which don't traverse lanes
         # (not entirely sure what all these actions are though)

=== modified file 'setup.py'
--- setup.py	2014-11-12 02:33:22 +0000
+++ setup.py	2015-04-17 14:40:43 +0000
@@ -12,11 +12,10 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-
-import sys
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+
 from setuptools import setup, find_packages
 import qakit
 
@@ -37,6 +36,7 @@
         'requests',
         'termcolor',
         'trello',
+        'beautifulsoup4',
     ],
     entry_points={
         'console_scripts': [