[Python-modules-commits] [py-macaroon-bakery] 04/05: Cherry-pick https://github.com/go-macaroon-bakery/py-macaroon-bakery/pull/26 to lower protobuf and requests dependencies to versions satisfiable in unstable.

[Colin Watson]

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

cjwatson pushed a commit to branch master
in repository py-macaroon-bakery.

commit 8181f6fcb5bc7683142f152358a183d808191b60
Merge: c5a506f 075e9d1
Author: Colin Watson <cjwatson at debian.org>
Date:   Fri Nov 3 16:10:44 2017 +0000

    Cherry-pick https://github.com/go-macaroon-bakery/py-macaroon-bakery/pull/26 to lower protobuf and requests dependencies to versions satisfiable in unstable.

 debian/.git-dpm                                   |  4 +--
 debian/changelog                                  |  4 +++
 debian/patches/lower-protobuf-requests-deps.patch | 32 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 setup.py                                          |  4 +--
 5 files changed, 41 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 0e8f4a8,0000000..78ae886
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
- 3d9eaeb5dacee168a93da090e2c0d46eedbe51a2
- 3d9eaeb5dacee168a93da090e2c0d46eedbe51a2
++075e9d186663b19cc3d3a892377e28fcfd7993a7
++075e9d186663b19cc3d3a892377e28fcfd7993a7
 +3d9eaeb5dacee168a93da090e2c0d46eedbe51a2
 +3d9eaeb5dacee168a93da090e2c0d46eedbe51a2
 +py-macaroon-bakery_0.0.4.orig.tar.gz
 +0991cc6e4167b4b83740f03baa89123ff6d9a424
 +69675
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 92170ca,0000000..a1bb32f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,0 +1,15 @@@
 +py-macaroon-bakery (0.0.4-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
++  * Cherry-pick
++    https://github.com/go-macaroon-bakery/py-macaroon-bakery/pull/26 to
++    lower protobuf and requests dependencies to versions satisfiable in
++    unstable.
 +
 + -- Colin Watson <cjwatson at debian.org>  Fri, 03 Nov 2017 12:13:49 +0000
 +
 +py-macaroon-bakery (0.0.3-1) unstable; urgency=medium
 +
 +  * Initial release (closes: #866779).
 +
 + -- Colin Watson <cjwatson at debian.org>  Thu, 02 Nov 2017 14:35:45 +0000
diff --cc debian/patches/lower-protobuf-requests-deps.patch
index 0000000,0000000..112c9ba
new file mode 100644
--- /dev/null
+++ b/debian/patches/lower-protobuf-requests-deps.patch
@@@ -1,0 -1,0 +1,32 @@@
++From 075e9d186663b19cc3d3a892377e28fcfd7993a7 Mon Sep 17 00:00:00 2001
++From: Andrea Azzarone <andrea.azzarone at canonical.com>
++Date: Fri, 3 Nov 2017 15:00:01 +0000
++Subject: Lowering the protobuf and requests deps.
++
++Origin: other, https://github.com/go-macaroon-bakery/py-macaroon-bakery/pull/26
++Forwarded: https://github.com/go-macaroon-bakery/py-macaroon-bakery/pull/26
++Patch-Name: lower-protobuf-requests-deps.patch
++
++Last-Update: 2017-11-03
++---
++ setup.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 7fbc6d3..54000e9 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -24,11 +24,11 @@ with open('README.rst') as readme_file:
++     readme = readme_file.read()
++ 
++ requirements = [
++-    'requests>=2.18.4,<3.0',
+++    'requests>=2.18.1,<3.0',
++     'PyNaCl>=1.1.2,<2.0',
++     'pymacaroons>=0.12.0,<1.0',
++     'six>=1.11.0,<2.0',
++-    'protobuf>=3.4.0,<4.0',
+++    'protobuf>=3.0.0,<4.0',
++     'pyRFC3339>=1.0,<2.0',
++     'pytz>=2017.2,<2018.0'
++ ]
diff --cc debian/patches/series
index 0000000,0000000..f688483
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++lower-protobuf-requests-deps.patch

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