[Python-modules-commits] [python-asyncssh] 06/07: merge patched into master
Vincent Bernat
bernat at moszumanska.debian.org
Sat May 21 14:17:22 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 f49ba51edd3356bedba460a08f6c2a73bd17bd7f
Merge: 41125ad 267bbb2
Author: Vincent Bernat <bernat at debian.org>
Date: Sat May 21 16:13:56 2016 +0200
merge patched into master
README.rst | 38 +-
asyncssh/__init__.py | 22 +-
asyncssh/agent.py | 215 ++
asyncssh/auth.py | 54 +-
asyncssh/auth_keys.py | 4 +-
asyncssh/channel.py | 510 ++--
asyncssh/client.py | 298 +++
asyncssh/connection.py | 2612 ++++++++++----------
asyncssh/crypto/chacha.py | 1 +
asyncssh/crypto/ec.py | 10 +-
asyncssh/crypto/pyca/cipher.py | 4 +-
asyncssh/crypto/pyca/dsa.py | 4 +-
asyncssh/crypto/pyca/ec.py | 4 +-
asyncssh/dh.py | 8 +-
asyncssh/ecdh.py | 11 +-
asyncssh/ed25519.py | 1 +
asyncssh/forward.py | 134 +-
asyncssh/known_hosts.py | 228 +-
asyncssh/listener.py | 215 +-
asyncssh/misc.py | 40 +-
asyncssh/packet.py | 8 +-
asyncssh/public_key.py | 100 +-
asyncssh/server.py | 656 +++++
asyncssh/session.py | 113 +-
asyncssh/sftp.py | 963 ++++----
asyncssh/stream.py | 63 +-
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 | 255 +-
docs/changes.rst | 152 ++
examples/check_exit_status.py | 2 +
examples/direct_client.py | 2 +
examples/listening_client.py | 2 +
examples/local_forwarding_client.py | 2 +
examples/local_forwarding_client2.py | 2 +
examples/math_client.py | 2 +
examples/remote_forwarding_client.py | 2 +
examples/remote_forwarding_client2.py | 2 +
examples/sample_client.py | 2 +
examples/set_environment.py | 2 +
examples/set_terminal.py | 2 +
examples/sftp_client.py | 2 +
examples/simple_client.py | 2 +
examples/stderr_client.py | 2 +
examples/stream_direct_client.py | 2 +
examples/stream_listening_client.py | 2 +
examples/stream_math_client.py | 2 +
pylintrc | 46 +-
tests/server.py | 148 ++
tests/test_agent.py | 221 ++
tests/test_auth.py | 54 +-
tests/test_channel.py | 1355 ++++++++++
tests/test_connection.py | 843 +++++++
tests/test_connection_auth.py | 832 +++++++
tests/test_forward.py | 933 +++++++
tests/test_kex.py | 34 +-
tests/test_known_hosts.py | 18 +-
tests/test_packet.py | 180 ++
tests/test_public_key.py | 68 +-
tests/test_sftp.py | 58 +
tests/test_stream.py | 296 +++
tests/util.py | 150 +-
64 files changed, 9466 insertions(+), 2539 deletions(-)
diff --cc debian/.git-dpm
index 48d4c98,0000000..3534393
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
- c1dab057ad5b7dbf9591d1e1c8fe4812da7ba0ed
- c1dab057ad5b7dbf9591d1e1c8fe4812da7ba0ed
- 9a16010d1a050309e546d35f0996837f75780394
++267bbb23f13c6b15e21b2de9c14d511c9478e81e
++267bbb23f13c6b15e21b2de9c14d511c9478e81e
++79cb36f3893c01e2808ecb05f8a247f65b508100
+79cb36f3893c01e2808ecb05f8a247f65b508100
+python-asyncssh_1.5.3.orig.tar.gz
+355136f09f66ceb911c73e42fd59a51c1d34476d
+203162
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-skip-tests-requiring-network-access.patch
index 52bdd2e,0000000..a078257
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 c1dab057ad5b7dbf9591d1e1c8fe4812da7ba0ed Mon Sep 17 00:00:00 2001
++From 267bbb23f13c6b15e21b2de9c14d511c9478e81e 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
+--- 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 2fdd540,0000000..94356cb
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 3490e4f87b75393e96d6c081b7999f4870ae09b4 Mon Sep 17 00:00:00 2001
++From 57b94f39d5ad883a0e536c63bc50b9e1100132d0 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