[Python-modules-commits] [python-asyncssh] 06/08: merge patched into master
Vincent Bernat
bernat at moszumanska.debian.org
Sat Jul 2 12:15:55 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 8f5a756815e8f5e4b3e2c647109420d1e359a72e
Merge: d00b762 fa40d92
Author: Vincent Bernat <bernat at debian.org>
Date: Sat Jul 2 13:53:59 2016 +0200
merge patched into master
.coveragerc | 2 +
.travis.yml | 70 +
.travis/build-libsodium.sh | 11 +
MANIFEST.in | 3 +-
README.rst | 29 +-
asyncssh/connection.py | 133 +-
asyncssh/misc.py | 60 +-
asyncssh/public_key.py | 6 +-
asyncssh/sftp.py | 365 ++--
asyncssh/version.py | 2 +-
debian/.git-dpm | 6 +-
.../0002-skip-tests-requiring-network-access.patch | 4 +-
debian/patches/sphinx-use-default-theme.patch | 2 +-
docs/api.rst | 7 +
docs/changes.rst | 47 +
docs/index.rst | 20 +-
examples/check_exit_status.py | 15 +-
examples/chroot_sftp_server.py | 13 +-
examples/direct_client.py | 17 +-
examples/direct_server.py | 13 +-
examples/listening_client.py | 17 +-
examples/local_forwarding_client.py | 15 +-
examples/local_forwarding_client2.py | 15 +-
examples/local_forwarding_server.py | 13 +-
examples/math_client.py | 15 +-
examples/math_server.py | 13 +-
examples/remote_forwarding_client.py | 15 +-
examples/remote_forwarding_client2.py | 15 +-
examples/remote_forwarding_server.py | 13 +-
examples/sample_client.py | 17 +-
examples/set_environment.py | 19 +-
examples/set_terminal.py | 21 +-
examples/sftp_client.py | 15 +-
examples/show_environment.py | 16 +-
examples/show_terminal.py | 18 +-
examples/simple_cert_server.py | 13 +-
examples/simple_client.py | 15 +-
examples/simple_keyed_server.py | 11 +-
examples/simple_server.py | 11 +-
examples/simple_sftp_server.py | 13 +-
examples/stderr_client.py | 15 +-
examples/stream_direct_client.py | 15 +-
examples/stream_direct_server.py | 18 +-
examples/stream_listening_client.py | 22 +-
examples/stream_math_client.py | 15 +-
examples/stream_math_server.py | 18 +-
setup.py | 4 +-
tests/__init__.py | 5 +-
tests/server.py | 19 +-
tests/test_auth_keys.py | 2 +-
tests/test_channel.py | 2 +-
tests/test_connection.py | 146 ++
tests/test_forward.py | 10 +-
tests/test_sftp.py | 2069 +++++++++++++++++++-
tests/util.py | 15 +-
tests_py35/test_async.py | 118 ++
tox.ini | 13 +
57 files changed, 3014 insertions(+), 617 deletions(-)
diff --cc debian/.git-dpm
index de72fc9,0000000..3616103
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
- 267bbb23f13c6b15e21b2de9c14d511c9478e81e
- 267bbb23f13c6b15e21b2de9c14d511c9478e81e
- 79cb36f3893c01e2808ecb05f8a247f65b508100
++fa40d92637428f74caa7358f0c59eece2dbdc2ba
++fa40d92637428f74caa7358f0c59eece2dbdc2ba
++1ed6ea46c8c27b3a572bb0638e3ab153c8d55720
+1ed6ea46c8c27b3a572bb0638e3ab153c8d55720
+python-asyncssh_1.5.6.orig.tar.gz
+7213914c766ab217f0e28d9f4ada9de3a527b2b6
+215285
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-skip-tests-requiring-network-access.patch
index a078257,0000000..0846316
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,30 @@@
- From 267bbb23f13c6b15e21b2de9c14d511c9478e81e Mon Sep 17 00:00:00 2001
++From fa40d92637428f74caa7358f0c59eece2dbdc2ba 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(+)
+
+diff --git a/tests/test_auth_keys.py b/tests/test_auth_keys.py
- index a97177d7f038..d428e339fcd1 100644
++index 0122d7359431..40e5e084257f 100644
+--- a/tests/test_auth_keys.py
++++ b/tests/test_auth_keys.py
+@@ -17,6 +17,8 @@
+
+ """
+
++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):
+ 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 94356cb,0000000..6b9df71
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 57b94f39d5ad883a0e536c63bc50b9e1100132d0 Mon Sep 17 00:00:00 2001
++From f6acdb9c15eef2ad9ffad6d8deedb127d5b8d41f 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