[Python-modules-commits] [parsedatetime] 03/04: merge patched into master

[Brian May]

This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch master
in repository parsedatetime.

commit 9e41c7066f79b353c51da3b77c49d9ec4d895b2c
Merge: d607362 56980eb
Author: Brian May <bam at debian.org>
Date:   Sat Mar 11 11:45:17 2017 +1100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...-delta-test-by-using-a-static-source-time.patch | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/TestDelta.py                                 |  4 +--
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 359dfef,0000000..f8b77f7
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 3ec58edd1e8edf1eb944f3562c66ec3b04b832dc
- 3ec58edd1e8edf1eb944f3562c66ec3b04b832dc
++56980ebc6028b129adfa8b359b03247de82c9a3c
++56980ebc6028b129adfa8b359b03247de82c9a3c
 +3ec58edd1e8edf1eb944f3562c66ec3b04b832dc
 +3ec58edd1e8edf1eb944f3562c66ec3b04b832dc
 +parsedatetime_2.1.orig.tar.gz
 +68db89ebcdfa5212aa28a7b709b449e027316d3e
 +56288
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-delta-test-by-using-a-static-source-time.patch
index 0000000,0000000..a407166
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-delta-test-by-using-a-static-source-time.patch
@@@ -1,0 -1,0 +1,33 @@@
++From 56980ebc6028b129adfa8b359b03247de82c9a3c Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Sat, 11 Mar 2017 11:44:54 +1100
++Subject: Fix delta test by using a static source time
++
++Apply patch from upstream:
++https://github.com/bear/parsedatetime/commit/76a97697e3611356b848f0aa7c759ff80fd7bd4c
++
++Without this patch, the tests would fail immediately after February, as
++February only has 28 days, and the tests currently assume months have 30
++days.
++
++https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=856625
++https://github.com/bear/parsedatetime/issues/215
++---
++ tests/TestDelta.py | 4 +---
++ 1 file changed, 1 insertion(+), 3 deletions(-)
++
++diff --git a/tests/TestDelta.py b/tests/TestDelta.py
++index c628d5e..a54aee1 100644
++--- a/tests/TestDelta.py
+++++ b/tests/TestDelta.py
++@@ -13,9 +13,7 @@ class test(unittest.TestCase):
++ 
++     def setUp(self):
++         self.cal = pdt.Calendar(version=pdt.VERSION_CONTEXT_STYLE)
++-        self.source = (self.yr, self.mth, self.dy,
++-                       self.hr, self.mn, self.sec,
++-                       self.wd, self.yd, self.isdst) = time.localtime()
+++        self.source = (2017, 1, 1, 7, 1, 2, 6, 1, 1)
++ 
++     def assertDelta(self, ts, years=None, months=None, **deltakw):
++         ts = ts[0]
diff --cc debian/patches/series
index 0000000,0000000..4d50e46
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-delta-test-by-using-a-static-source-time.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/parsedatetime.git