[Python-modules-commits] [python-asyncssh] 06/08: merge patched into master
Vincent Bernat
bernat at moszumanska.debian.org
Mon Sep 18 10:02:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
bernat pushed a commit to branch debian/master
in repository python-asyncssh.
commit 653ad43c7f4a736da91630f48493c4b8b221a672
Merge: 9582738 8ad4e85
Author: Vincent Bernat <bernat at debian.org>
Date: Wed Jul 5 16:49:38 2017 +0200
merge patched into master
.travis.yml | 2 +-
COPYRIGHT | 2 +-
README.rst | 18 +-
appveyor.yml | 32 +
asyncssh/__init__.py | 7 +-
asyncssh/auth.py | 354 ++++-
asyncssh/channel.py | 5 +
asyncssh/client.py | 9 +-
asyncssh/connection.py | 364 +++--
asyncssh/dh.py | 461 ++++--
asyncssh/ecdh.py | 9 +-
asyncssh/gss.py | 55 +
asyncssh/gss_unix.py | 146 ++
asyncssh/gss_win32.py | 173 ++
asyncssh/kex.py | 41 +-
asyncssh/known_hosts.py | 29 +-
asyncssh/misc.py | 10 +-
asyncssh/process.py | 476 ++++--
asyncssh/public_key.py | 71 +-
asyncssh/scp.py | 832 ++++++++++
asyncssh/server.py | 42 +-
asyncssh/sftp.py | 798 +++++++---
asyncssh/stream.py | 84 +-
asyncssh/version.py | 4 +-
asyncssh/x11.py | 9 +-
debian/.git-dpm | 6 +-
.../0002-skip-tests-requiring-network-access.patch | 2 +-
debian/patches/sphinx-use-default-theme.patch | 2 +-
docs/api.rst | 168 +-
docs/changes.rst | 85 +-
docs/conf.py | 2 +
docs/index.rst | 91 ++
examples/chat_server.py | 19 +-
examples/editor.py | 27 +-
examples/math_server.py | 16 +-
.../{simple_cert_server.py => redirect_server.py} | 18 +-
examples/scp_client.py | 23 +
examples/show_environment.py | 18 +-
examples/show_terminal.py | 29 +-
examples/simple_cert_server.py | 12 +-
examples/simple_keyed_server.py | 12 +-
...{simple_cert_server.py => simple_scp_server.py} | 9 +-
examples/simple_server.py | 12 +-
pylintrc | 4 +-
setup.py | 1 +
tests/gss_stub.py | 43 +
tests/gssapi_stub.py | 128 ++
tests/server.py | 65 +-
tests/sspi_stub.py | 125 ++
tests/test_auth.py | 238 ++-
tests/test_cipher.py | 5 +-
tests/test_connection.py | 138 +-
tests/test_connection_auth.py | 257 ++-
tests/test_forward.py | 8 +
tests/test_kex.py | 259 ++-
tests/test_known_hosts.py | 25 +-
tests/test_process.py | 556 ++++---
tests/test_public_key.py | 117 +-
tests/test_sftp.py | 1674 +++++++++++++++++---
tests/test_x11.py | 18 +-
tests/util.py | 84 +-
tests_py35/test_sftp.py | 18 +-
tox.ini | 21 +-
63 files changed, 6865 insertions(+), 1503 deletions(-)
diff --cc debian/.git-dpm
index cc67f92,0000000..f82c6fd
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
- 3733cdd03556921c2440c8b94ce203724f7c550b
- 3733cdd03556921c2440c8b94ce203724f7c550b
- ba570a9963219db1000e6e051f60ad5e81692438
++8ad4e85cc2c16e078e74278b8c4aca77ac96cf68
++8ad4e85cc2c16e078e74278b8c4aca77ac96cf68
++0dc15b0d2a6d3a2bb983e7d42845220212169792
+0dc15b0d2a6d3a2bb983e7d42845220212169792
+python-asyncssh_1.10.1.orig.tar.gz
+8a1437dfa9700db2c501a23bccc8c38d2768e8a1
+290352
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-skip-tests-requiring-network-access.patch
index e1fca74,0000000..aa7c20e
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 3733cdd03556921c2440c8b94ce203724f7c550b Mon Sep 17 00:00:00 2001
++From 8ad4e85cc2c16e078e74278b8c4aca77ac96cf68 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 49bec65,0000000..bc6a835
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 ad44f82dba68d9f2829f4915fafd8abd8781c5af Mon Sep 17 00:00:00 2001
++From d4f34e5741e4949c26cd18747321aa7929433fb0 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