diff options
-rw-r--r-- | debian/.git-dpm | 11 | ||||
-rw-r--r-- | debian/changelog | 23 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/control | 44 | ||||
-rw-r--r-- | debian/copyright | 10 | ||||
-rw-r--r-- | debian/patches/isolate-from-proxy.patch | 43 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rwxr-xr-x | debian/rules | 7 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/watch | 4 |
10 files changed, 145 insertions, 0 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm new file mode 100644 index 0000000..865a7b9 --- /dev/null +++ b/debian/.git-dpm @@ -0,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 +debianTag="debian/%e%v" +patchedTag="patched/%e%v" +upstreamTag="upstream/%e%u" diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..a5ebfcc --- /dev/null +++ b/debian/changelog @@ -0,0 +1,23 @@ +py-macaroon-bakery (0.0.5-1) UNRELEASED; 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. + + -- Colin Watson <cjwatson@debian.org> Mon, 06 Nov 2017 10:05:18 +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@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@debian.org> Thu, 02 Nov 2017 14:35:45 +0000 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..d592607 --- /dev/null +++ b/debian/control @@ -0,0 +1,44 @@ +Source: py-macaroon-bakery +Section: python +Priority: optional +Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> +Uploaders: Colin Watson <cjwatson@debian.org> +Build-Depends: debhelper (>= 9~), + dh-python, + python3-all, + python3-httmock, + python3-mock, + python3-nacl (>= 1.1.2), + python3-nose, + python3-protobuf (>= 3.0.0), + python3-pymacaroons (>= 0.12.0), + python3-requests (>= 2.18.1), + python3-rfc3339 (>= 1.0), + python3-setuptools, + python3-six (>= 1.11.0), + python3-tz (>= 2017.2) +Standards-Version: 4.1.1 +X-Python3-Version: >= 3.5 +Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/py-macaroon-bakery.git +Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/py-macaroon-bakery.git +Homepage: https://github.com/go-macaroon-bakery/py-macaroon-bakery + +Package: python3-macaroonbakery +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends}, + ${python3:Depends} +Description: Higher-level macaroon operations for Python 3 + Macaroons, like cookies, are a form of bearer credential. Unlike opaque + tokens, macaroons embed caveats that define specific authorization + requirements for the target service, the service that issued the root + macaroon and which is capable of verifying the integrity of macaroons it + receives. + . + Macaroons allow for delegation and attenuation of authorization. They are + simple and fast to verify, and decouple authorization policy from the + enforcement of that policy. + . + The macaroonbakery library builds on pymacaroons to allow working with + macaroons at a higher level, such as by automatically gathering discharge + macaroons for third-party caveats from their corresponding services. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..ed4a695 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,10 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: py-macaroon-bakery +Upstream-Contact: Juju UI Team <juju-gui@lists.ubuntu.com> +Source: https://github.com/go-macaroon-bakery/py-macaroon-bakery + +Files: * +Copyright: 2017 Canonical Ltd. +License: LGPL-3 + On Debian and Debian-based systems, a copy of the GNU Lesser General Public + License version 3 is available in /usr/share/common-licenses/LGPL-3. diff --git a/debian/patches/isolate-from-proxy.patch b/debian/patches/isolate-from-proxy.patch new file mode 100644 index 0000000..ee5d08a --- /dev/null +++ b/debian/patches/isolate-from-proxy.patch @@ -0,0 +1,43 @@ +From 8051fc0e07186078ae5419ac9de246cf6e57359a Mon Sep 17 00:00:00 2001 +From: Colin Watson <cjwatson@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) + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..781b9ec --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +isolate-from-proxy.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..d01c6c6 --- /dev/null +++ b/debian/rules @@ -0,0 +1,7 @@ +#! /usr/bin/make -f + +export PYBUILD_NAME := macaroonbakery +export PYBUILD_TEST_NOSE := 1 + +%: + dh $@ --with python3 --buildsystem=pybuild diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..3b4de03 --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=4 +opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%py-macaroon-bakery-$1.tar.gz%" \ + https://github.com/go-macaroon-bakery/py-macaroon-bakery/releases \ + (?:.*?/)?v?(\d[\d.]*)\.tar\.gz |