work-items-tracker

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

  1. 2013
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Merged at revision: 308
Proposed branch: lp:~cjohnston/launchpad-work-items-tracker/2013
Merge into: lp:launchpad-work-items-tracker
Diff against target: 127 lines (+15/-10)
8 files modified
all-projects (+1/-1)
burndown-chart (+1/-1)
collect (+1/-1)
generate-all (+1/-1)
html-report (+8/-3)
json-report (+1/-1)
themes/ubuntu/templates/body.html (+1/-1)
wiki-status (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/launchpad-work-items-tracker/2013
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+141193@code.launchpad.net

Commit message

Updates copyright to 2013

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1#!/usr/bin/python1#!/usr/bin/python
2# Run work item tracker for all available configurations; this is intended to2# Run work item tracker for all available configurations; this is intended to
3# be run from cron hourly.3# be run from cron hourly.
4# Copyright (C) 2010, 2011 Canonical Ltd.4# Copyright (C) 2010-2013 Canonical Ltd.
5# Author: Martin Pitt <martin.pitt@ubuntu.com>5# Author: Martin Pitt <martin.pitt@ubuntu.com>
6# License: GPL-36# License: GPL-3
77
88
=== 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 @@
2#2#
3# Create a burndown chart from a work item database.3# Create a burndown chart from a work item database.
4#4#
5# Copyright (C) 2010, 2011 Canonical Ltd.5# Copyright (C) 2010-2013 Canonical Ltd.
6# License: GPL-36# License: GPL-3
77
8import optparse, datetime, sys8import optparse, datetime, sys
99
=== modified file 'collect'
--- collect 2012-11-10 16:56:39 +0000
+++ collect 2012-12-23 22:13:25 +0000
@@ -3,7 +3,7 @@
3# Pull work items from various sources (blueprint whiteboards, linked blueprint3# Pull work items from various sources (blueprint whiteboards, linked blueprint
4# bugs, wiki pages) and put them into a database.4# bugs, wiki pages) and put them into a database.
5#5#
6# Copyright (C) 2010, 2011 Canonical Ltd.6# Copyright (C) 2010-2013 Canonical Ltd.
7# License: GPL-37# License: GPL-3
88
9import urllib, re, sys, optparse, smtplib, pwd, os, urlparse9import urllib, re, sys, optparse, smtplib, pwd, os, urlparse
1010
=== 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 @@
3# Create HTML/JSON reports and burndown charts for all teams and milestones3# Create HTML/JSON reports and burndown charts for all teams and milestones
4# from a configuration file4# from a configuration file
5#5#
6# Copyright (C) 2010, 2011 Canonical Ltd.6# Copyright (C) 2010-2013 Canonical Ltd.
7# License: GPL-37# License: GPL-3
88
9import optparse, os.path, sys9import optparse, os.path, sys
1010
=== 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 @@
3#3#
4# Create HTML reports from a work item database.4# Create HTML reports from a work item database.
5#5#
6# Copyright (C) 2010, 2011 Canonical Ltd.6# Copyright (C) 2010-2013 Canonical Ltd.
7# License: GPL-37# License: GPL-3
88
9import optparse9import optparse
@@ -11,6 +11,8 @@
11from report_tools import escape_url11from report_tools import escape_url
12import report_tools12import report_tools
1313
14cfg = report_tools.load_config(opts.config)
15trend_starts = cfg.get('trend_start', {})
1416
15class WorkitemTarget(object):17class WorkitemTarget(object):
1618
@@ -103,10 +105,13 @@
103 self.status = status105 self.status = status
104 self.blueprint = blueprint106 self.blueprint = blueprint
105 self.assignee = assignee107 self.assignee = assignee
106108trend_
107109
108def spec_group_completion(db, team, milestone_collection=None):110def spec_group_completion(db, team, milestone_collection=None):
109 data = report_tools.spec_group_completion(db, team, milestone_collection=milestone_collection)111 if trend_starts:
112 data = report_tools.spec_group_completion(db, team, trend_starts, milestone_collection=milestone_collection)
113 else:
114 data = report_tools.spec_group_completion(db, team, milestone_collection=milestone_collection)
110 if not data:115 if not data:
111 return dict(areas=[], group_completion_series=[], groups=[])116 return dict(areas=[], group_completion_series=[], groups=[])
112 groups = []117 groups = []
113118
=== 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 @@
3# Create a JSON report from a work item database. The structure is the one3# Create a JSON report from a work item database. The structure is the one
4# returned by report_tools.assignee_completion()4# returned by report_tools.assignee_completion()
5#5#
6# Copyright (C) 2010, 2011 Canonical Ltd.6# Copyright (C) 2010-2013 Canonical Ltd.
7# License: GPL-37# License: GPL-3
88
9import optparse, simplejson9import optparse, simplejson
1010
=== 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 @@
49 <img class="png" src="${util.url('canonical_footer_logo.png')}" alt="Canonical" />49 <img class="png" src="${util.url('canonical_footer_logo.png')}" alt="Canonical" />
50</div>50</div>
51 <div class="copyright">51 <div class="copyright">
52 <p>&copy; 2010, 2011 Canonical Ltd., Ubuntu Community. Ubuntu and Canonical are registered trademarks of Canonical Ltd.52 <p>&copy; 2010-2013 Canonical Ltd., Ubuntu Community. Ubuntu and Canonical are registered trademarks of Canonical Ltd.
53<br />53<br />
54Problems with this site? <a href="https://bugs.launchpad.net/launchpad-work-items-tracker/+filebug">File a Bug</a></p>54Problems with this site? <a href="https://bugs.launchpad.net/launchpad-work-items-tracker/+filebug">File a Bug</a></p>
55 </div>55 </div>
5656
=== 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 @@
1#!/usr/bin/python1#!/usr/bin/python
2#2#
3# Copyright (C) 2010, 2011 Canonical Ltd.3# Copyright (C) 2010-2013 Canonical Ltd.
4# License: GPL-34# License: GPL-3
55
6import sys6import sys

Subscribers

People subscribed via source and target branches

to all changes: