[Python-modules-commits] [python-asyncssh] 05/06: merge patched into master
Vincent Bernat
bernat at moszumanska.debian.org
Wed Oct 26 20:39:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
bernat pushed a commit to branch master
in repository python-asyncssh.
commit 37aa0cb49e1eae5602e07fe626197898d9d0501f
Merge: 5cfe09e 631d88a
Author: Vincent Bernat <bernat at debian.org>
Date: Wed Oct 26 22:33:23 2016 +0200
merge patched into master
CONTRIBUTING.rst | 2 +-
asyncssh/__init__.py | 3 +-
asyncssh/agent.py | 363 +++++++++++++-
asyncssh/connection.py | 386 ++++++---------
asyncssh/constants.py | 1 +
asyncssh/crypto/pyca/rsa.py | 22 +-
asyncssh/dh.py | 20 +-
asyncssh/dsa.py | 22 +-
asyncssh/ecdsa.py | 30 +-
asyncssh/ed25519.py | 22 +-
asyncssh/misc.py | 21 +
asyncssh/public_key.py | 521 +++++++++++++++++---
asyncssh/rsa.py | 29 +-
asyncssh/version.py | 2 +-
debian/.git-dpm | 6 +-
.../0002-skip-tests-requiring-network-access.patch | 16 +-
...03-Discard-errors-when-invoking-ssh-agent.patch | 41 --
debian/patches/series | 1 -
debian/patches/sphinx-use-default-theme.patch | 2 +-
docs/api.rst | 111 ++++-
docs/changes.rst | 51 +-
docs/index.rst | 2 +-
tests/server.py | 40 +-
tests/test_agent.py | 321 ++++++++++---
tests/test_auth.py | 23 +-
tests/test_auth_keys.py | 30 +-
tests/test_channel.py | 2 +-
tests/test_connection.py | 56 +++
tests/test_connection_auth.py | 138 +++++-
tests/test_known_hosts.py | 27 +-
tests/test_public_key.py | 534 ++++++++++++---------
tests/test_sftp.py | 6 +-
tests/util.py | 2 +-
33 files changed, 2019 insertions(+), 834 deletions(-)
diff --cc debian/.git-dpm
index 2d9af25,0000000..c6684f7
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
- 01eb957d65d2682a75d67767e0f885fd2bfaa7de
- 01eb957d65d2682a75d67767e0f885fd2bfaa7de
- c29d1479a0acc9e21fd871c7bc0d4121d76da1fe
++631d88a1e9590c7b06060a3a601d0db1336e5e20
++631d88a1e9590c7b06060a3a601d0db1336e5e20
++316b2e7f91c50d23cc7da8cd9b7eff7c9f64903b
+316b2e7f91c50d23cc7da8cd9b7eff7c9f64903b
+python-asyncssh_1.7.1.orig.tar.gz
+8ef728c88e90621c42b251f84735153ed84175ec
+245606
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-skip-tests-requiring-network-access.patch
index 1c6b5e2,0000000..acf5b77
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 80b0b9d365c3e098544dae34ad4712aad73771fc Mon Sep 17 00:00:00 2001
++From 631d88a1e9590c7b06060a3a601d0db1336e5e20 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 c103728faa89..f5984f95dd76 100644
++index 0bb50febc175..d36ef50136e0 100644
+--- a/tests/test_auth_keys.py
++++ b/tests/test_auth_keys.py
- @@ -18,6 +18,7 @@
- """
++@@ -13,6 +13,7 @@
++ """Unit tests for matching against authorized_keys file"""
+
+ from unittest.mock import patch
++import unittest
+
- from asyncssh import import_public_key
- from asyncssh.auth_keys import import_authorized_keys, read_authorized_keys
- @@ -67,6 +68,7 @@ class _TestAuthorizedKeys(TempDirTestCase):
++ import asyncssh
++
++@@ -55,6 +56,7 @@ class _TestAuthorizedKeys(TempDirTestCase):
+ else:
- return import_authorized_keys(auth_keys)
++ 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/series
index 5926e08,0000000..d889a5c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
+sphinx-use-default-theme.patch
+0002-skip-tests-requiring-network-access.patch
- 0003-Discard-errors-when-invoking-ssh-agent.patch
diff --cc debian/patches/sphinx-use-default-theme.patch
index 13f5f6c,0000000..86181ad
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 3ddd1a95c6c008e5968d1655e36c500b167e6b11 Mon Sep 17 00:00:00 2001
++From 3c339006ecc3e79c310ec81e26e97c1fa53ff205 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
More information about the Python-modules-commits
mailing list