From f25843d56621655367f7baa9775b4459a2f3ebc7 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 1 Jun 2015 23:15:02 +0200 Subject: [PATCH] * Removes the patch to de-embbed six, which is now an external dependency also in upstream code. --- debian/changelog | 8 +++++++ debian/control | 22 ++++++++--------- debian/patches/series | 1 - debian/patches/six.patch | 51 ---------------------------------------- 4 files changed, 19 insertions(+), 63 deletions(-) delete mode 100644 debian/patches/series delete mode 100644 debian/patches/six.patch diff --git a/debian/changelog b/debian/changelog index 1d880d5..f84b6db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-retrying (1.3.3-1) unstable; urgency=medium + + * New upstream release. + * Removes the patch to de-embbed six, which is now an external dependency + also in upstream code. + + -- Thomas Goirand Mon, 01 Jun 2015 23:10:00 +0200 + python-retrying (1.2.3-2) unstable; urgency=medium * Removed embedded copy of six using a patch from Chuck Short. Thanks to diff --git a/debian/control b/debian/control index 491bebe..669a771 100644 --- a/debian/control +++ b/debian/control @@ -2,16 +2,14 @@ Source: python-retrying Section: python Priority: optional Maintainer: PKG OpenStack -Uploaders: Julien Danjou , - Thomas Goirand , - Mehdi Abaakouk , - Gonéri Le Bouder +Uploaders: Thomas Goirand , Build-Depends: debhelper (>= 9), - python-all (>= 2.6.6-3~), + python-all, python-setuptools, python3-all, - python3-setuptools -Build-Depends-Indep: python-six, python3-six + python3-setuptools, +Build-Depends-Indep: python-six, + python3-six, Standards-Version: 3.9.5 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-retrying.git Vcs-Git: git://anonscm.debian.org/openstack/python-retrying.git @@ -19,8 +17,9 @@ Homepage: https://github.com/rholder/retrying Package: python-retrying Architecture: all -Pre-Depends: dpkg (>= 1.15.6~) -Depends: python-six, ${misc:Depends}, ${python:Depends} +Depends: python-six, + ${misc:Depends}, + ${python:Depends}, Description: simplifies the task of adding retry behavior - Python 2.x Retrying is an Apache 2.0 licensed general-purpose retrying library, written in Python, to simplify the task of adding retry behavior to just about @@ -37,8 +36,9 @@ Description: simplifies the task of adding retry behavior - Python 2.x Package: python3-retrying Architecture: all -Pre-Depends: dpkg (>= 1.15.6~) -Depends: python3-six, ${misc:Depends}, ${python3:Depends} +Depends: python3-six, + ${misc:Depends}, + ${python3:Depends}, Description: simplifies the task of adding retry behavior - Python 3.x Retrying is an Apache 2.0 licensed general-purpose retrying library, written in Python, to simplify the task of adding retry behavior to just about diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 6a5c3e8..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -six.patch diff --git a/debian/patches/six.patch b/debian/patches/six.patch deleted file mode 100644 index ff01cfd..0000000 --- a/debian/patches/six.patch +++ /dev/null @@ -1,51 +0,0 @@ -Description: Remove six copying and use six directly. -Author: Chuck Short -Forwarded: Not yet -Last-Update: 2014-09-30 - -Index: python-retrying/retrying.py -=================================================================== ---- python-retrying.orig/retrying.py -+++ python-retrying/retrying.py -@@ -40,31 +40,7 @@ import sys - import time - import traceback - --# Python 3 compatibility hacks, pilfered from https://pypi.python.org/pypi/six/1.6.1 --PY3 = sys.version_info[0] == 3 --if PY3: -- def reraise(tp, value, tb=None): -- if value.__traceback__ is not tb: -- raise value.with_traceback(tb) -- raise value -- --else: -- def exec_(_code_, _globs_=None, _locs_=None): -- """Execute code in a namespace.""" -- if _globs_ is None: -- frame = sys._getframe(1) -- _globs_ = frame.f_globals -- if _locs_ is None: -- _locs_ = frame.f_locals -- del frame -- elif _locs_ is None: -- _locs_ = _globs_ -- exec("""exec _code_ in _globs_, _locs_""") -- -- -- exec_("""def reraise(tp, value, tb=None): -- raise tp, value, tb --""") -+import six - - # sys.maxint / 2, since Python 3.2 doesn't have a sys.maxint... - MAX_WAIT = 1073741823 -@@ -282,7 +258,7 @@ class Attempt(object): - if wrap_exception: - raise RetryError(self) - else: -- reraise(self.value[0], self.value[1], self.value[2]) -+ six.reraise(self.value[0], self.value[1], self.value[2]) - else: - return self.value -