← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/launchpad/pytz-2016.4 into lp:launchpad

 

Colin Watson has proposed merging lp:~cjwatson/launchpad/pytz-2016.4 into lp:launchpad.

Commit message:
Upgrade to pytz 2016.4.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1589111 in Launchpad itself: "Time zone info"
  https://bugs.launchpad.net/launchpad/+bug/1589111

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/pytz-2016.4/+merge/296518

Upgrade to pytz 2016.4.

In r17289 I incorrectly modified ztk-versions.cfg rather than putting Launchpad overrides in versions.cfg.  This corrects that mistake.

America/Montreal isn't a thing any more; see https://github.com/eggert/tz/commit/2a9e84a1750300b648836e02422e99c5e24cf386.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/pytz-2016.4 into lp:launchpad.
=== modified file 'lib/lp/blueprints/stories/sprints/xx-sprints.txt'
--- lib/lp/blueprints/stories/sprints/xx-sprints.txt	2016-01-26 15:47:37 +0000
+++ lib/lp/blueprints/stories/sprints/xx-sprints.txt	2016-06-06 08:26:33 +0000
@@ -218,7 +218,7 @@
 We fix the dates and change the address, we expect to be redirected to the
 sprint home page.
 
-    >>> browser.getControl('Timezone').value = ['America/Montreal']
+    >>> browser.getControl('Timezone').value = ['America/Toronto']
     >>> browser.getControl(
     ...     'Starting Date and Time').value = '2006-01-10 08:30'
     >>> browser.getControl(

=== modified file 'versions.cfg'
--- versions.cfg	2016-05-24 04:45:38 +0000
+++ versions.cfg	2016-06-06 08:26:33 +0000
@@ -119,6 +119,7 @@
 python-subunit = 0.0.8beta
 python-swiftclient = 1.5.0
 PyYAML = 3.10
+pytz = 2016.4
 rabbitfixture = 0.3.6
 requests = 2.7.0
 requests-toolbelt = 0.6.2

=== modified file 'ztk-versions.cfg'
--- ztk-versions.cfg	2014-12-30 14:39:32 +0000
+++ ztk-versions.cfg	2016-06-06 08:26:33 +0000
@@ -81,7 +81,7 @@
 Pygments = 1.4
 python-gettext = 1.0
 python-subunit = 0.0.7
-pytz = 2014.10
+pytz = 2013b
 RestrictedPython = 3.6.0
 setuptools = 0.6c11
 Sphinx = 1.0.8


Follow ups