[Python-modules-commits] [py-macaroon-bakery] 03/04: New upstream release (1.1.0)
Colin Watson
cjwatson at moszumanska.debian.org
Mon Feb 5 16:05:36 UTC 2018
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 533dfe1ab9feb21173bd3a1825a5f2afd95801a8
Merge: efd539f 00ab469
Author: Colin Watson <cjwatson at debian.org>
Date: Tue Dec 12 15:20:49 2017 +0000
New upstream release (1.1.0)
Makefile | 15 +-
debian/.git-dpm | 14 +-
debian/changelog | 6 +
debian/patches/isolate-from-proxy.patch | 38 ++++-
docs/conf.py | 2 +-
macaroonbakery/__init__.py | 137 -----------------
macaroonbakery/{utils.py => _utils/__init__.py} | 39 +++--
macaroonbakery/{ => bakery}/__init__.py | 32 ++--
.../{authorizer.py => bakery/_authorizer.py} | 5 +-
macaroonbakery/{bakery.py => bakery/_bakery.py} | 8 +-
macaroonbakery/{checker.py => bakery/_checker.py} | 36 +++--
macaroonbakery/{codec.py => bakery/_codec.py} | 66 ++++----
.../{discharge.py => bakery/_discharge.py} | 48 ++++--
macaroonbakery/{error.py => bakery/_error.py} | 0
.../{identity.py => bakery/_identity.py} | 4 +-
.../{internal => bakery/_internal}/__init__.py | 0
.../{internal => bakery/_internal}/id.proto | 0
.../{internal => bakery/_internal}/id_pb2.py | 0
macaroonbakery/{keys.py => bakery/_keys.py} | 20 ++-
.../{macaroon.py => bakery/_macaroon.py} | 70 +++++----
macaroonbakery/{oven.py => bakery/_oven.py} | 57 ++++---
macaroonbakery/{store.py => bakery/_store.py} | 0
.../{third_party.py => bakery/_third_party.py} | 0
.../{versions.py => bakery/_versions.py} | 0
macaroonbakery/checkers/__init__.py | 18 +--
.../checkers/{auth_context.py => _auth_context.py} | 0
macaroonbakery/checkers/{caveat.py => _caveat.py} | 11 +-
.../checkers/{checkers.py => _checkers.py} | 23 +--
.../checkers/{conditions.py => _conditions.py} | 0
.../checkers/{declared.py => _declared.py} | 12 +-
.../checkers/{namespace.py => _namespace.py} | 4 +-
.../checkers/{operation.py => _operation.py} | 2 +-
macaroonbakery/checkers/{time.py => _time.py} | 14 +-
macaroonbakery/checkers/{utils.py => _utils.py} | 0
macaroonbakery/httpbakery/__init__.py | 12 +-
.../httpbakery/{browser.py => _browser.py} | 17 +-
.../httpbakery/{client.py => _client.py} | 111 +++++++------
.../httpbakery/{discharge.py => _discharge.py} | 7 +-
macaroonbakery/httpbakery/{error.py => _error.py} | 10 +-
.../httpbakery/{interactor.py => _interactor.py} | 9 +-
.../httpbakery/{keyring.py => _keyring.py} | 6 +-
macaroonbakery/httpbakery/agent/__init__.py | 8 +-
.../httpbakery/agent/{agent.py => _agent.py} | 115 +++++++-------
macaroonbakery/tests/common.py | 5 +-
macaroonbakery/tests/test_agent.py | 171 ++++++++-------------
macaroonbakery/tests/test_authorizer.py | 2 +-
macaroonbakery/tests/test_bakery.py | 93 +++++++++--
macaroonbakery/tests/test_checker.py | 34 ++--
macaroonbakery/tests/test_checkers.py | 7 +-
macaroonbakery/tests/test_client.py | 130 +++++++++++++---
macaroonbakery/tests/test_codec.py | 7 +-
macaroonbakery/tests/test_discharge.py | 5 +-
macaroonbakery/tests/test_discharge_all.py | 5 +-
macaroonbakery/tests/test_keyring.py | 16 +-
macaroonbakery/tests/test_macaroon.py | 12 +-
macaroonbakery/tests/test_oven.py | 8 +-
macaroonbakery/tests/test_store.py | 2 +-
macaroonbakery/tests/test_time.py | 19 ++-
macaroonbakery/tests/test_utils.py | 74 +++++++++
setup.py | 2 +-
tox.ini | 2 +-
61 files changed, 882 insertions(+), 688 deletions(-)
diff --cc debian/.git-dpm
index eb270f8,0000000..96ae457
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
- 530e1e702c8743fc8ea93db035bf86f6c07e6d09
- 530e1e702c8743fc8ea93db035bf86f6c07e6d09
- 949b7072cabce0daed6c94993ad44c8ea8648dbd
- 949b7072cabce0daed6c94993ad44c8ea8648dbd
- py-macaroon-bakery_0.0.6.orig.tar.gz
- 840f786baa4226742e0c709fafc8422aac59a92b
- 80215
++00ab469a4ae426c346228bd68eabe0fd4e689e4c
++00ab469a4ae426c346228bd68eabe0fd4e689e4c
++9e4403035a9953c99117083e6373ae3c441a76b5
++9e4403035a9953c99117083e6373ae3c441a76b5
++py-macaroon-bakery_1.1.0.orig.tar.gz
++690a8b89539dd1e2ade3f11481b2a56d8d55d281
++82188
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index e5aec60,0000000..5451cec
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,0 +1,36 @@@
++py-macaroon-bakery (1.1.0-1) UNRELEASED; urgency=medium
++
++ * New upstream release.
++
++ -- Colin Watson <cjwatson at debian.org> Tue, 12 Dec 2017 15:25:31 +0000
++
+py-macaroon-bakery (0.0.6-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Colin Watson <cjwatson at debian.org> Sat, 11 Nov 2017 12:55:42 +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 89d7af6,0000000..46df46e
mode 100644,000000..100644
--- a/debian/patches/isolate-from-proxy.patch
+++ b/debian/patches/isolate-from-proxy.patch
@@@ -1,43 -1,0 +1,67 @@@
- From 530e1e702c8743fc8ea93db035bf86f6c07e6d09 Mon Sep 17 00:00:00 2001
++From 00ab469a4ae426c346228bd68eabe0fd4e689e4c 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
++Last-Update: 2018-02-05
+
+Patch-Name: isolate-from-proxy.patch
+---
++ macaroonbakery/tests/test_bakery.py | 6 ++++++
+ macaroonbakery/tests/test_client.py | 7 +++++++
- 1 file changed, 7 insertions(+)
++ 2 files changed, 13 insertions(+)
+
++diff --git a/macaroonbakery/tests/test_bakery.py b/macaroonbakery/tests/test_bakery.py
++index a6c3e58..72a6928 100644
++--- a/macaroonbakery/tests/test_bakery.py
+++++ b/macaroonbakery/tests/test_bakery.py
++@@ -1,5 +1,6 @@
++ # Copyright 2017 Canonical Ltd.
++ # Licensed under the LGPLv3, see LICENCE file for details.
+++import os
++ from unittest import TestCase
++
++ import macaroonbakery.httpbakery as httpbakery
++@@ -171,6 +172,11 @@ def wait_on_error(url, request):
++
++
++ class TestBakery(TestCase):
+++ def setUp(self):
+++ super(TestBakery, 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 assert_cookie_security(self, cookies, name, secure):
++ for cookie in cookies:
+diff --git a/macaroonbakery/tests/test_client.py b/macaroonbakery/tests/test_client.py
- index e1a4009..8263f54 100644
++index ab20c3b..04e2f2b 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
++ import threading
+ from unittest import TestCase
- try:
- from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
- @@ -26,6 +27,12 @@ TEST_OP = bakery.Op(entity='test', action='test')
++
++@@ -27,6 +28,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
More information about the Python-modules-commits
mailing list