[Python-modules-commits] [python-asyncssh] 05/06: merge patched into master
Vincent Bernat
bernat at moszumanska.debian.org
Sun Dec 25 09:32:43 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 600bc9cfae285ae289a950b9b052d2bbef16e9f7
Merge: eda4dd4 63afe83
Author: Vincent Bernat <bernat at debian.org>
Date: Sun Dec 25 10:26:25 2016 +0100
merge patched into master
.travis.yml | 18 +-
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/changes.rst | 13 +
docs/index.rst | 12 +-
tests/server.py | 29 +-
tests/test_agent.py | 9 +-
tests/test_channel.py | 3 +
tests/test_connection_auth.py | 24 +-
tests/test_kex.py | 10 +-
tests/test_process.py | 2 +-
tests/test_public_key.py | 355 +++++++++++++--------
14 files changed, 315 insertions(+), 172 deletions(-)
diff --cc debian/.git-dpm
index 1aea828,0000000..0040493
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
- ad1c7fe5039de8a06c4b356d8104683ca1945bbe
- ad1c7fe5039de8a06c4b356d8104683ca1945bbe
- c35de600ebdf2dc6e83aa2849678cb4b18e3a2b4
++63afe83bc40980a6f3f507acdd1a3ba54f40d2bd
++63afe83bc40980a6f3f507acdd1a3ba54f40d2bd
++46e25dbe90822ebc8bc2aef1fd21acb0ccce11bd
+46e25dbe90822ebc8bc2aef1fd21acb0ccce11bd
+python-asyncssh_1.7.3.orig.tar.gz
+39ee6e71b126f639ec0edd87aadf6099f288dbad
+246435
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-skip-tests-requiring-network-access.patch
index c0b5568,0000000..5cbbea1
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 ad1c7fe5039de8a06c4b356d8104683ca1945bbe Mon Sep 17 00:00:00 2001
++From 63afe83bc40980a6f3f507acdd1a3ba54f40d2bd 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 864dab9,0000000..b4986d7
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 448c240cfcbd9380b88449794ff8c271230ce1e5 Mon Sep 17 00:00:00 2001
++From 362b2f5457f02a4dc6f02a1607e8c7407959996d 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