[Python-modules-commits] [python-pyotp] 03/03: Update changelog, remove upstream applied patch.

[Hugo Lefeuvre]

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

hle pushed a commit to branch master
in repository python-pyotp.

commit bc699b7a79b19281a03ad9e3183f2c426bd8af1b
Author: Hugo Lefeuvre <hle at debian.org>
Date:   Fri Sep 9 17:46:50 2016 +0200

    Update changelog, remove upstream applied patch.
---
 debian/changelog                                | 10 ++++++++-
 debian/patches/series                           |  1 -
 debian/patches/timedelta-ingest-timestamp.patch | 28 -------------------------
 debian/rules                                    |  1 -
 4 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5230ae9..62ebef0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
+python-pyotp (2.2.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Remove debian/patches/timedelta-ingest-timestamp.patch: Integrated in new
+    upstream version.
+
+ -- Hugo Lefeuvre <hle at debian.org>  Fri, 09 Sep 2016 17:41:55 +0200
+
 python-pyotp (2.1.1-2) unstable; urgency=high
 
   * Fix FTBFS on 32-bit platforms (Closes: #831399).
   * debian/control:
-    - Add Python version informations in the short descriptions.
+    - Add Python version information in the short descriptions.
 
  -- Hugo Lefeuvre <hle at debian.org>  Fri, 15 Jul 2016 16:45:17 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e7ca535..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-timedelta-ingest-timestamp.patch
diff --git a/debian/patches/timedelta-ingest-timestamp.patch b/debian/patches/timedelta-ingest-timestamp.patch
deleted file mode 100644
index 6890971..0000000
--- a/debian/patches/timedelta-ingest-timestamp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Subject: Use timedelta to ingest timestamp
-Origin: upstream
-Bug-Debian: https://bugs.debian.org/831399
-Last-Update: 2016-08-31
---- a/src/pyotp/totp.py	2016-08-31 12:22:53.183244421 +0200
-+++ b/src/pyotp/totp.py	2016-08-31 12:22:53.183244421 +0200
-@@ -24,7 +24,7 @@
-         @param [Integer] counter_offset an amount of ticks to add to the time counter 
-         """
-         if not isinstance(for_time, datetime.datetime):
--            for_time = datetime.datetime.fromtimestamp(int(for_time))
-+            for_time = datetime.datetime.fromtimestamp(0) + datetime.timedelta(seconds=int(for_time))
-         return self.generate_otp(self.timecode(for_time) + counter_offset)
- 
-     def now(self):
---- a/test.py	2016-08-31 12:22:43.471268681 +0200
-+++ b/test.py	2016-08-31 12:23:10.411201361 +0200
-@@ -92,6 +92,10 @@
-         for digest, secret in self.RFC_VALUES:
-             totp = pyotp.TOTP(base64.b32encode(secret), 8, digest)
-             for utime, code in self.RFC_VALUES[(digest, secret)]:
-+                # 32-bit platforms use native functions to handle timestamps, so they fail this test
-+                # (and will fail after 19 January 2038)
-+                if utime > sys.maxsize:
-+                    continue
-                 value = totp.at(utime)
-                 msg = "%s != %s (%s, time=%d)"
-                 msg %= (value, code, digest().name, utime)
diff --git a/debian/rules b/debian/rules
index 32985fd..8dd84a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,6 @@
 #! /usr/bin/make -f
 
 export PYBUILD_NAME=pyotp
-export PYBUILD_TEST_ARGS=-s {dir}/ -p "test.py"
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild

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