[Python-modules-commits] [python-gnupg] 10/10: merge patched into master
Elena Grandi
valhalla-guest at moszumanska.debian.org
Tue Sep 13 13:59:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
valhalla-guest pushed a commit to branch master
in repository python-gnupg.
commit 6fd4c105ae20b3d9c974a0e1847c6cbc1d17dead
Merge: ed45a48 09a1f18
Author: Elena Grandi <valhalla-d at trueelena.org>
Date: Tue Sep 13 15:18:38 2016 +0200
merge patched into master
PKG-INFO | 9 +-
README.rst | 30 +++-
debian/.git-dpm | 6 +-
.../0002-Default-on-using-gpg1-as-gpgbinary.patch | 10 +-
debian/patches/skip_network_needing_test.patch | 12 +-
gnupg.py | 173 ++++++++++++---------
setup.py | 3 +-
test_gnupg.py | 146 ++++++++++++++---
8 files changed, 271 insertions(+), 118 deletions(-)
diff --cc debian/.git-dpm
index 77e8dfc,0000000..b12a216
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
- 56b122340a4917baee47a0f2714bcee9d88fde55
- 56b122340a4917baee47a0f2714bcee9d88fde55
- 16065427a552e386da63551fe79e7836133dfac5
++09a1f18cf9864dba35db34744200f7e40b401d6f
++09a1f18cf9864dba35db34744200f7e40b401d6f
++53585fde665095b170b0706129af9238b168becf
+53585fde665095b170b0706129af9238b168becf
+python-gnupg_0.3.9.orig.tar.gz
+75fd5ed615edfaf5b3e5ef0af0d14f0e3c6cd0b1
+42260
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Default-on-using-gpg1-as-gpgbinary.patch
index 5d209c8,0000000..a69d15d
mode 100644,000000..100644
--- a/debian/patches/0002-Default-on-using-gpg1-as-gpgbinary.patch
+++ b/debian/patches/0002-Default-on-using-gpg1-as-gpgbinary.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 56b122340a4917baee47a0f2714bcee9d88fde55 Mon Sep 17 00:00:00 2001
++From 09a1f18cf9864dba35db34744200f7e40b401d6f Mon Sep 17 00:00:00 2001
+From: Elena Grandi <valhalla-d at trueelena.org>
+Date: Wed, 17 Aug 2016 19:39:21 +0200
+Subject: Default on using gpg1 as gpgbinary
+
+---
+ gnupg.py | 2 +-
+ test_gnupg.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gnupg.py b/gnupg.py
- index ec70661..d67de74 100644
++index 2a08d96..1d32a48 100644
+--- a/gnupg.py
++++ b/gnupg.py
- @@ -689,7 +689,7 @@ class GPG(object):
++@@ -706,7 +706,7 @@ class GPG(object):
+ }
+
+ "Encapsulate access to the gpg executable"
+- def __init__(self, gpgbinary='gpg', gnupghome=None, verbose=False,
++ def __init__(self, gpgbinary='gpg1', gnupghome=None, verbose=False,
+ use_agent=False, keyring=None, options=None,
+ secret_keyring=None):
+ """Initialize a GPG process wrapper. Options are:
+diff --git a/test_gnupg.py b/test_gnupg.py
- index f6325ef..afb15c5 100644
++index 3559e62..806a7bf 100644
+--- a/test_gnupg.py
++++ b/test_gnupg.py
- @@ -23,7 +23,7 @@ ALL_TESTS = True
++@@ -24,7 +24,7 @@ ALL_TESTS = True
+
+ logger = logging.getLogger(__name__)
+
+-GPGBINARY = os.environ.get('GPGBINARY', 'gpg')
++GPGBINARY = os.environ.get('GPGBINARY', 'gpg1')
+
+ KEYS_TO_IMPORT = """-----BEGIN PGP PUBLIC KEY BLOCK-----
+ Version: GnuPG v1.4.9 (MingW32)
diff --cc debian/patches/skip_network_needing_test.patch
index a15a71f,0000000..fa39055
mode 100644,000000..100644
--- a/debian/patches/skip_network_needing_test.patch
+++ b/debian/patches/skip_network_needing_test.patch
@@@ -1,55 -1,0 +1,55 @@@
- From d19d3f404e9d384d54b563ba52edcdd47fce66fb Mon Sep 17 00:00:00 2001
++From 7a72a5cdc56afed312e44dd45ecc17b026469935 Mon Sep 17 00:00:00 2001
+From: Elena Grandi <elena.valhalla at gmail.com>
+Date: Thu, 8 Oct 2015 12:11:21 -0700
+Subject: Skip tests that require internet access
+
+Forwarded: not-needed
+Patch-Name: skip_network_needing_test.patch
+---
+ gnupg.py | 12 ++++++------
+ test_gnupg.py | 1 +
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/gnupg.py b/gnupg.py
- index cfc6cb9..ec70661 100644
++index 4515841..2a08d96 100644
+--- a/gnupg.py
++++ b/gnupg.py
- @@ -1044,8 +1044,8 @@ class GPG(object):
++@@ -1066,8 +1066,8 @@ class GPG(object):
+ >>> shutil.rmtree("keys")
+ >>> gpg = GPG(gnupghome="keys")
+ >>> os.chmod('keys', 0x1C0)
+- >>> result = gpg.recv_keys('keyserver.ubuntu.com', '92905378')
+- >>> assert result
++ >>> result = gpg.recv_keys('keyserver.ubuntu.com', '92905378') # doctest: +SKIP
++ >>> assert result # doctest: +SKIP
+
+ """
+ result = self.result_map['import'](self)
- @@ -1186,11 +1186,11 @@ class GPG(object):
++@@ -1215,11 +1215,11 @@ class GPG(object):
+ >>> shutil.rmtree('keys')
+ >>> gpg = GPG(gnupghome='keys')
+ >>> os.chmod('keys', 0x1C0)
+- >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>')
+- >>> assert result, 'Failed using default keyserver'
++ >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>') # doctest: +SKIP
++ >>> assert result, 'Failed using default keyserver' # doctest: +SKIP
+ >>> keyserver = 'keyserver.ubuntu.com'
+- >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>', keyserver)
+- >>> assert result, 'Failed using keyserver.ubuntu.com'
++ >>> result = gpg.search_keys('<vinay_sajip at hotmail.com>', keyserver) # doctest: +SKIP
++ >>> assert result, 'Failed using keyserver.ubuntu.com' # doctest: +SKIP
+
+ """
+ query = query.strip()
+diff --git a/test_gnupg.py b/test_gnupg.py
- index f7133b6..f6325ef 100644
++index 34c48bb..3559e62 100644
+--- a/test_gnupg.py
++++ b/test_gnupg.py
- @@ -597,6 +597,7 @@ class GPGTestCase(unittest.TestCase):
++@@ -694,6 +694,7 @@ class GPGTestCase(unittest.TestCase):
+ shutil.rmtree(d)
+ logger.debug("test_filename_with_spaces ends")
+
++ @unittest.skip('requires network')
+ def test_search_keys(self):
+ "Test that searching for keys works"
+ r = self.gpg.search_keys('<vinay_sajip at hotmail.com>')
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-gnupg.git
More information about the Python-modules-commits
mailing list