[Python-modules-commits] [python-asyncssh] 05/06: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository python-asyncssh.

commit b66a3a619349056d00fbf063d91737bef1ddd878
Merge: c3dd5e8 ad1c7fe
Author: Vincent Bernat <bernat at debian.org>
Date:   Tue Nov 1 19:55:55 2016 +0100

    merge patched into master

 asyncssh/agent.py                                  | 16 +++++++-------
 asyncssh/connection.py                             |  2 +-
 asyncssh/public_key.py                             | 25 ----------------------
 asyncssh/sftp.py                                   |  2 ++
 asyncssh/version.py                                |  2 +-
 debian/.git-dpm                                    |  6 +++---
 .../0002-skip-tests-requiring-network-access.patch |  2 +-
 debian/patches/sphinx-use-default-theme.patch      |  2 +-
 docs/api.rst                                       |  2 +-
 docs/changes.rst                                   | 15 +++++++++++--
 tests/test_sftp.py                                 |  7 ++++--
 11 files changed, 36 insertions(+), 45 deletions(-)

diff --cc debian/.git-dpm
index faf2527,0000000..0704f7f
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
- 631d88a1e9590c7b06060a3a601d0db1336e5e20
- 631d88a1e9590c7b06060a3a601d0db1336e5e20
- 316b2e7f91c50d23cc7da8cd9b7eff7c9f64903b
++ad1c7fe5039de8a06c4b356d8104683ca1945bbe
++ad1c7fe5039de8a06c4b356d8104683ca1945bbe
++c35de600ebdf2dc6e83aa2849678cb4b18e3a2b4
 +c35de600ebdf2dc6e83aa2849678cb4b18e3a2b4
 +python-asyncssh_1.7.2.orig.tar.gz
 +35a37980dd7c5f833478f90ffd652c6421ac77bb
 +245634
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-skip-tests-requiring-network-access.patch
index acf5b77,0000000..c0b5568
mode 100644,000000..100644
--- a/debian/patches/0002-skip-tests-requiring-network-access.patch
+++ b/debian/patches/0002-skip-tests-requiring-network-access.patch
@@@ -1,29 -1,0 +1,29 @@@
- From 631d88a1e9590c7b06060a3a601d0db1336e5e20 Mon Sep 17 00:00:00 2001
++From ad1c7fe5039de8a06c4b356d8104683ca1945bbe Mon Sep 17 00:00:00 2001
 +From: Vincent Bernat <vincent at bernat.im>
 +Date: Sun, 3 Jan 2016 18:11:46 +0100
 +Subject: skip tests requiring network access
 +
 +---
 + tests/test_auth_keys.py | 2 ++
 + 1 file changed, 2 insertions(+)
 +
 +diff --git a/tests/test_auth_keys.py b/tests/test_auth_keys.py
 +index 0bb50febc175..d36ef50136e0 100644
 +--- a/tests/test_auth_keys.py
 ++++ b/tests/test_auth_keys.py
 +@@ -13,6 +13,7 @@
 + """Unit tests for matching against authorized_keys file"""
 + 
 + from unittest.mock import patch
 ++import unittest
 + 
 + import asyncssh
 + 
 +@@ -55,6 +56,7 @@ class _TestAuthorizedKeys(TempDirTestCase):
 +         else:
 +             return asyncssh.import_authorized_keys(auth_keys)
 + 
 ++    @unittest.skip("network access is required for those tests")
 +     def test_matches(self):
 +         """Test authorized keys matching"""
 + 
diff --cc debian/patches/sphinx-use-default-theme.patch
index 86181ad,0000000..864dab9
mode 100644,000000..100644
--- a/debian/patches/sphinx-use-default-theme.patch
+++ b/debian/patches/sphinx-use-default-theme.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 3c339006ecc3e79c310ec81e26e97c1fa53ff205 Mon Sep 17 00:00:00 2001
++From 448c240cfcbd9380b88449794ff8c271230ce1e5 Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 11:09:41 -0700
 +Subject: make Sphinx use default theme
 +
 +Forwarded: not-needed
 +
 +The "classic" theme is introduced in Sphinx 1.3 and not available in
 +Sphinx 1.2.
 +
 +Patch-Name: sphinx-use-default-theme.patch
 +---
 + docs/rftheme/static/rftheme.css_t | 2 +-
 + docs/rftheme/theme.conf           | 2 +-
 + 2 files changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/docs/rftheme/static/rftheme.css_t b/docs/rftheme/static/rftheme.css_t
 +index 66aad65ff6f4..77fe744d83d8 100644
 +--- a/docs/rftheme/static/rftheme.css_t
 ++++ b/docs/rftheme/static/rftheme.css_t
 +@@ -1,4 +1,4 @@
 +- at import url("classic.css");
 ++ at import url("default.css");
 + 
 + .tight-list * {
 +     line-height: 110% !important;
 +diff --git a/docs/rftheme/theme.conf b/docs/rftheme/theme.conf
 +index 1c2b15e426cf..a417128664b1 100644
 +--- a/docs/rftheme/theme.conf
 ++++ b/docs/rftheme/theme.conf
 +@@ -1,4 +1,4 @@
 + [theme]
 +-inherit = classic
 ++inherit = default
 + stylesheet = rftheme.css
 + pygments_style = sphinx

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