[Python-modules-commits] [py-macaroon-bakery] 03/04: New upstream release (0.0.6)

[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 33f68384774e4c9b0bc11389b1559ec9b0cb41b5
Merge: fdd77e9 530e1e7
Author: Colin Watson <cjwatson at debian.org>
Date:   Sat Nov 11 12:55:26 2017 +0000

    New upstream release (0.0.6)

 debian/.git-dpm                          | 14 +++++++-------
 debian/changelog                         |  6 ++++++
 debian/patches/isolate-from-proxy.patch  |  2 +-
 docs/conf.py                             |  2 +-
 macaroonbakery/httpbakery/agent/agent.py |  9 ++++++---
 setup.py                                 |  2 +-
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --cc debian/.git-dpm
index 865a7b9,0000000..eb270f8
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
- 8051fc0e07186078ae5419ac9de246cf6e57359a
- 8051fc0e07186078ae5419ac9de246cf6e57359a
- 37d61d0415f6cc96a7a9abe057e1ae0f89fd977e
- 37d61d0415f6cc96a7a9abe057e1ae0f89fd977e
- py-macaroon-bakery_0.0.5.orig.tar.gz
- b6a1d6a8ff0cc252cf2dd3464bb881daadb7b056
- 80202
++530e1e702c8743fc8ea93db035bf86f6c07e6d09
++530e1e702c8743fc8ea93db035bf86f6c07e6d09
++949b7072cabce0daed6c94993ad44c8ea8648dbd
++949b7072cabce0daed6c94993ad44c8ea8648dbd
++py-macaroon-bakery_0.0.6.orig.tar.gz
++840f786baa4226742e0c709fafc8422aac59a92b
++80215
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 4270b39,0000000..f9930a5
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,0 +1,30 @@@
++py-macaroon-bakery (0.0.6-1) UNRELEASED; urgency=medium
++
++  * New upstream release.
++
++ -- Colin Watson <cjwatson at debian.org>  Sat, 11 Nov 2017 12:55:06 +0000
++
 +py-macaroon-bakery (0.0.5-1) unstable; urgency=medium
 +
 +  * New upstream release.
 +  * Apply https://github.com/go-macaroon-bakery/py-macaroon-bakery/pull/28
 +    to isolate client tests from any configured HTTP proxy.
 +  * Set Rules-Requires-Root: no.
 +
 + -- Colin Watson <cjwatson at debian.org>  Mon, 06 Nov 2017 10:42:31 +0000
 +
 +py-macaroon-bakery (0.0.4-1) unstable; 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 16:11:44 +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/isolate-from-proxy.patch
index ee5d08a,0000000..89d7af6
mode 100644,000000..100644
--- a/debian/patches/isolate-from-proxy.patch
+++ b/debian/patches/isolate-from-proxy.patch
@@@ -1,43 -1,0 +1,43 @@@
- From 8051fc0e07186078ae5419ac9de246cf6e57359a Mon Sep 17 00:00:00 2001
++From 530e1e702c8743fc8ea93db035bf86f6c07e6d09 Mon Sep 17 00:00:00 2001
 +From: Colin Watson <cjwatson at debian.org>
 +Date: Mon, 6 Nov 2017 10:27:10 +0000
 +Subject: Isolate client tests from any HTTP proxy
 +
 +Debian's Python packaging tools set http_proxy to a non-existent proxy
 +to help flush out packages that try to talk to the network during build,
 +but these tests could previously fail in more normal development
 +environments too.
 +
 +Forwarded: https://github.com/go-macaroon-bakery/py-macaroon-bakery/pull/28
 +Last-Update: 2017-11-06
 +
 +Patch-Name: isolate-from-proxy.patch
 +---
 + macaroonbakery/tests/test_client.py | 7 +++++++
 + 1 file changed, 7 insertions(+)
 +
 +diff --git a/macaroonbakery/tests/test_client.py b/macaroonbakery/tests/test_client.py
 +index e1a4009..8263f54 100644
 +--- a/macaroonbakery/tests/test_client.py
 ++++ b/macaroonbakery/tests/test_client.py
 +@@ -3,6 +3,7 @@
 + import base64
 + import datetime
 + import json
 ++import os
 + from unittest import TestCase
 + try:
 +     from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
 +@@ -26,6 +27,12 @@ TEST_OP = bakery.Op(entity='test', action='test')
 + 
 + 
 + class TestClient(TestCase):
 ++    def setUp(self):
 ++        super(TestClient, self).setUp()
 ++        # http_proxy would cause requests to talk to the proxy, which is
 ++        # unlikely to know how to talk to the test server.
 ++        os.environ.pop('http_proxy', None)
 ++
 +     def test_single_service_first_party(self):
 +         b = new_bakery('loc', None, None)
 + 

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