Merge lp:~cjohnston/launchpad-work-items-tracker/2013 into lp:launchpad-work-items-tracker

[Chris Johnston]

Updates copyright to 2013

[Martin Pitt (pitti)]

Looks good, thanks! But I committed it as "html-report: Support trend_start option; update copyright; thanks Chris Johnston" as that's the actual change in this commit. Just bumping the copyright years without actually changing something to the files seems like busywork to me.

review: Approve

=== modified file 'all-projects'
--- all-projects	2012-08-27 15:32:43 +0000
+++ all-projects	2012-12-23 22:13:25 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Run work item tracker for all available configurations; this is intended to
 # be run from cron hourly.
-# Copyright (C) 2010, 2011 Canonical Ltd.
+# Copyright (C) 2010-2013 Canonical Ltd.
 # Author: Martin Pitt <[e-mail]>
 # License: GPL-3
 

=== modified file 'burndown-chart'
--- burndown-chart	2012-08-24 05:29:13 +0000
+++ burndown-chart	2012-12-23 22:13:25 +0000
@@ -2,7 +2,7 @@
 #
 # Create a burndown chart from a work item database.
 #
-# Copyright (C) 2010, 2011 Canonical Ltd.
+# Copyright (C) 2010-2013 Canonical Ltd.
 # License: GPL-3
 
 import optparse, datetime, sys

=== modified file 'collect'
--- collect	2012-11-10 16:56:39 +0000
+++ collect	2012-12-23 22:13:25 +0000
@@ -3,7 +3,7 @@
 # Pull work items from various sources (blueprint whiteboards, linked blueprint
 # bugs, wiki pages) and put them into a database.
 #
-# Copyright (C) 2010, 2011 Canonical Ltd.
+# Copyright (C) 2010-2013 Canonical Ltd.
 # License: GPL-3
 
 import urllib, re, sys, optparse, smtplib, pwd, os, urlparse

=== modified file 'generate-all'
--- generate-all	2011-09-09 07:14:11 +0000
+++ generate-all	2012-12-23 22:13:25 +0000
@@ -3,7 +3,7 @@
 # Create HTML/JSON reports and burndown charts for all teams and milestones
 # from a configuration file
 #
-# Copyright (C) 2010, 2011 Canonical Ltd.
+# Copyright (C) 2010-2013 Canonical Ltd.
 # License: GPL-3
 
 import optparse, os.path, sys

=== modified file 'html-report'
--- html-report	2012-06-20 19:54:52 +0000
+++ html-report	2012-12-23 22:13:25 +0000
@@ -3,7 +3,7 @@
 #
 # Create HTML reports from a work item database.
 #
-# Copyright (C) 2010, 2011 Canonical Ltd.
+# Copyright (C) 2010-2013 Canonical Ltd.
 # License: GPL-3
 
 import optparse
@@ -11,6 +11,8 @@
 from report_tools import escape_url
 import report_tools
 
+cfg = report_tools.load_config(opts.config)
+trend_starts = cfg.get('trend_start', {})
 
 class WorkitemTarget(object):
 
@@ -103,10 +105,13 @@
         self.status = status
         self.blueprint = blueprint
         self.assignee = assignee
-
+trend_
 
 def spec_group_completion(db, team, milestone_collection=None):
-    data = report_tools.spec_group_completion(db, team, milestone_collection=milestone_collection)
+    if trend_starts:
+        data = report_tools.spec_group_completion(db, team, trend_starts, milestone_collection=milestone_collection)
+    else:
+        data = report_tools.spec_group_completion(db, team, milestone_collection=milestone_collection)
     if not data:
         return dict(areas=[], group_completion_series=[], groups=[])
     groups = []

=== modified file 'json-report'
--- json-report	2011-09-09 07:14:11 +0000
+++ json-report	2012-12-23 22:13:25 +0000
@@ -3,7 +3,7 @@
 # Create a JSON report from a work item database. The structure is the one
 # returned by report_tools.assignee_completion()
 #
-# Copyright (C) 2010, 2011 Canonical Ltd.
+# Copyright (C) 2010-2013 Canonical Ltd.
 # License: GPL-3
 
 import optparse, simplejson

=== modified file 'themes/ubuntu/templates/body.html'
--- themes/ubuntu/templates/body.html	2011-12-09 19:51:36 +0000
+++ themes/ubuntu/templates/body.html	2012-12-23 22:13:25 +0000
@@ -49,7 +49,7 @@
         <img class="png" src="${util.url('canonical_footer_logo.png')}" alt="Canonical" />
 </div>
    <div class="copyright">
-    <p>&copy; 2010, 2011 Canonical Ltd., Ubuntu Community. Ubuntu and Canonical are registered trademarks of Canonical Ltd.
+    <p>&copy; 2010-2013 Canonical Ltd., Ubuntu Community. Ubuntu and Canonical are registered trademarks of Canonical Ltd.
 <br />
 Problems with this site? <a href="https://bugs.launchpad.net/launchpad-work-items-tracker/+filebug">File a Bug</a></p>
    </div>

=== modified file 'wiki-status'
--- wiki-status	2011-09-09 07:14:11 +0000
+++ wiki-status	2012-12-23 22:13:25 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright (C) 2010, 2011 Canonical Ltd.
+# Copyright (C) 2010-2013 Canonical Ltd.
 # License: GPL-3
 
 import sys