Merge lp:~abentley/lp-release-manager-tools/credentials-option into lp:~sinzui/lp-release-manager-tools/trunk

[Aaron Bentley]

Tweaks for Juju Reports.

Some tweaks to support use for Juju Reports.

Since there is no keyring on the Juju Reports machine, this branch provides a -C option for supplying a credentials file.

Since juju-reports allows the start day to be configured and runs 10 cycles at a time, allow these values to be overridden for make_cycles.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'lp_release_tools/pull_bugs.py'
--- lp_release_tools/pull_bugs.py	2014-02-13 14:01:50 +0000
+++ lp_release_tools/pull_bugs.py	2014-05-24 02:14:53 +0000
@@ -103,6 +103,9 @@
     parser.add_option(
         "-s", "--statuses", dest="statuses", action="append",
         type="string", help="Match bugs with all of the listed statues.")
+    parser.add_option(
+        "-C", "--credentials", dest="credentials", type="string",
+        help="Launchpad credentials file.")
     parser.set_defaults(
         outfile='bug-data.json',
         union_file=None,
@@ -111,7 +114,8 @@
         tags=None,
         milestone=None,
         importance=None,
-        statuses=[]
+        statuses=[],
+        credentials=None,
     )
     return parser
 
@@ -134,7 +138,7 @@
     lp = Launchpad.login_with(
         'milestone-report',
         service_root='https://api.launchpad.net',
-        version='devel')
+        version='devel', credentials_file=options.credentials)
     targets = get_targets(lp, project)
     search_params = dict(
         status=options.statuses, modified_since=options.since,

=== modified file 'lp_release_tools/report_bugs.py'
--- lp_release_tools/report_bugs.py	2014-03-03 13:45:39 +0000
+++ lp_release_tools/report_bugs.py	2014-05-24 02:14:53 +0000
@@ -95,7 +95,7 @@
                 triaged_count += 1
         if triaged_count == 0:
             return 0
-        average_triage_time = delta / triaged_count 
+        average_triage_time = delta / triaged_count
         return average_triage_time.days
 
     @staticmethod
@@ -117,17 +117,17 @@
     return bugs
 
 
-def make_cycles(today, tag_groups, importance_groups):
-    """Return a list of bug reporting cycles."""
+def make_cycles(today, tag_groups, importance_groups, start_day=6,
+                cycle_count=26):
+    """Return a list of bug reporting cycles.
+
+    :param start_day: Starts on Sunday by default. AU Monday is UTC Sunday.
+    """
     cycles = []
-    SUNDAY = 6  # AU Monday is UTC Sunday.
     WEEK = timedelta(7)
     this_day = today.weekday()
-    if this_day != SUNDAY:
-        finish_date = today + timedelta(SUNDAY - this_day)
-    else:
-        finish_date = today
-    for ignore in range(26):
+    finish_date = today + timedelta((start_day - this_day) % 7)
+    for ignore in range(cycle_count):
         start_date = finish_date - WEEK
         cycle = WorkCycle(
             start_date, finish_date, tag_groups, importance_groups)