[Python-modules-commits] [python-asyncssh] 05/14: merge patched into master
Vincent Bernat
bernat at moszumanska.debian.org
Sat Sep 10 12:10:10 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 0ed6d30a9a241d1114f2b6a667a607e938067809
Merge: 621c3b5 01fec57
Author: Vincent Bernat <bernat at debian.org>
Date: Sat Sep 3 13:08:45 2016 +0200
merge patched into master
.travis.yml | 12 +-
COPYRIGHT | 2 +-
README.rst | 23 +-
asyncssh/__init__.py | 11 +-
asyncssh/channel.py | 57 +-
asyncssh/connection.py | 149 +++-
asyncssh/constants.py | 1 +
asyncssh/crypto/pyca/dsa.py | 63 +-
asyncssh/crypto/pyca/ec.py | 81 +-
asyncssh/crypto/pyca/rsa.py | 61 +-
asyncssh/dsa.py | 12 +-
asyncssh/ecdsa.py | 12 +-
asyncssh/ed25519.py | 8 +
asyncssh/editor.py | 574 +++++++++++++
asyncssh/misc.py | 39 +-
asyncssh/process.py | 951 +++++++++++++++++++++
asyncssh/public_key.py | 57 ++
asyncssh/rsa.py | 12 +-
asyncssh/session.py | 11 +-
asyncssh/sftp.py | 29 +-
asyncssh/stream.py | 101 ++-
asyncssh/version.py | 2 +-
debian/.git-dpm | 6 +-
.../0002-skip-tests-requiring-network-access.patch | 17 +-
debian/patches/sphinx-use-default-theme.patch | 2 +-
docs/api.rst | 120 ++-
docs/changes.rst | 51 ++
docs/index.rst | 193 +++--
examples/{sample_client.py => callback_client.py} | 0
examples/{simple_client.py => callback_client2.py} | 0
examples/{stderr_client.py => callback_client3.py} | 0
.../{math_server.py => callback_math_server.py} | 10 +-
examples/chat_server.py | 75 ++
examples/check_exit_status.py | 27 +-
examples/{stream_math_server.py => editor.py} | 42 +-
examples/gather_results.py | 40 +
examples/math_client.py | 35 +-
examples/math_server.py | 49 +-
.../{stream_math_client.py => redirect_input.py} | 7 +-
...tream_math_client.py => redirect_local_pipe.py} | 12 +-
...ream_math_client.py => redirect_remote_pipe.py} | 9 +-
examples/set_environment.py | 15 +-
examples/set_terminal.py | 17 +-
examples/show_environment.py | 10 +-
examples/show_terminal.py | 10 +-
examples/simple_cert_server.py | 25 +-
examples/simple_client.py | 12 +-
examples/simple_keyed_server.py | 21 +-
examples/simple_server.py | 21 +-
setup.py | 8 +-
tests/test_auth_keys.py | 29 +-
tests/test_channel.py | 37 +-
tests/test_editor.py | 261 ++++++
tests/test_process.py | 843 ++++++++++++++++++
tests/test_public_key.py | 53 +-
tests/test_sftp.py | 4 +-
tests/test_stream.py | 4 +-
tests/util.py | 7 +
tests_py35/test_connection.py | 44 +
tests_py35/test_process.py | 44 +
tests_py35/{test_async.py => test_sftp.py} | 30 +-
tests_py35/test_stream.py | 54 ++
62 files changed, 3975 insertions(+), 537 deletions(-)
diff --cc debian/.git-dpm
index dffc9ae,0000000..7863a31
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
- fa40d92637428f74caa7358f0c59eece2dbdc2ba
- fa40d92637428f74caa7358f0c59eece2dbdc2ba
- 1ed6ea46c8c27b3a572bb0638e3ab153c8d55720
++01fec57f57dd66584f177cdddd495a9f3fbc077b
++01fec57f57dd66584f177cdddd495a9f3fbc077b
++55a6973e7d0211c26482de87ab852adc39cea592
+55a6973e7d0211c26482de87ab852adc39cea592
+python-asyncssh_1.6.1.orig.tar.gz
+473240d28064d427240be4d2bf40756ef194386f
+235227
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-skip-tests-requiring-network-access.patch
index 0846316,0000000..de84858
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,30 -1,0 +1,29 @@@
- From fa40d92637428f74caa7358f0c59eece2dbdc2ba Mon Sep 17 00:00:00 2001
++From 01fec57f57dd66584f177cdddd495a9f3fbc077b 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 | 3 +++
- 1 file changed, 3 insertions(+)
++ 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 0122d7359431..40e5e084257f 100644
++index c103728faa89..f5984f95dd76 100644
+--- a/tests/test_auth_keys.py
++++ b/tests/test_auth_keys.py
- @@ -17,6 +17,8 @@
-
++@@ -18,6 +18,7 @@
+ """
+
++ from unittest.mock import patch
++import unittest
- +
++
+ from asyncssh import import_public_key
+ from asyncssh.auth_keys import import_authorized_keys, read_authorized_keys
-
- @@ -65,6 +67,7 @@ class _TestAuthorizedKeys(TempDirTestCase):
++@@ -67,6 +68,7 @@ class _TestAuthorizedKeys(TempDirTestCase):
+ else:
+ return 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 6b9df71,0000000..78aadfa
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 f6acdb9c15eef2ad9ffad6d8deedb127d5b8d41f Mon Sep 17 00:00:00 2001
++From e5a82a48c8c91d7e464173b0482f26dd89887776 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