[Python-modules-commits] [pyeapi] 05/12: merge patched into master

[Vincent Bernat]

This is an automated email from the git hooks/post-receive script.

bernat pushed a commit to branch master
in repository pyeapi.

commit 17efa2b1f0d60f5d9a2021f1ec4ea21c38755dd6
Merge: f372d5a 000a361
Author: Vincent Bernat <bernat at debian.org>
Date:   Sun Sep 25 17:40:53 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...ix-test-case-when-random-is-a-valid-VLAN.patch} |  4 ++--
 ...on-extension-is-included-in-Sphinx-since-.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  3 ++-
 docs/conf.py                                       |  2 +-
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 8b1086c,0000000..9346ef1
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
- 04fc2968495498f745e861a31e7ad906e127fb03
- 04fc2968495498f745e861a31e7ad906e127fb03
++000a361c6c1b6d1457de99032f9ad9fb73c8bbe6
++000a361c6c1b6d1457de99032f9ad9fb73c8bbe6
 +4f185fa24c738f17a79431a6af0cfd5a7c0c7e9a
 +4f185fa24c738f17a79431a6af0cfd5a7c0c7e9a
 +pyeapi_0.6.1.orig.tar.gz
 +ad91a983a9916782f20ad3e8ce0e699008f62aab
 +115787
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-tests-fix-test-case-when-random-is-a-valid-VLAN.patch
index 0014651,0000000..507d8d6
mode 100644,000000..100644
--- a/debian/patches/0001-tests-fix-test-case-when-random-is-a-valid-VLAN.patch
+++ b/debian/patches/0001-tests-fix-test-case-when-random-is-a-valid-VLAN.patch
@@@ -1,27 -1,0 +1,27 @@@
- From 04fc2968495498f745e861a31e7ad906e127fb03 Mon Sep 17 00:00:00 2001
++From 0168a8affac6c1fc2490487121bdad3b5c4f0995 Mon Sep 17 00:00:00 2001
 +From: Vincent Bernat <vincent at bernat.im>
 +Date: Sun, 25 Sep 2016 17:37:16 +0200
- Subject: Fix test case when random is a valid VLAN
++Subject: tests: fix test case when random is a valid VLAN
 +
 +A random string (like '214') can be a valid VLAN. Fix the test case such
 +that the not-so-random string can never be a VLAN.
 +
 +Closes: #838828.
 +Forwarded: https://github.com/arista-eosplus/pyeapi/pull/109
 +---
 + test/unit/test_api_vlans.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/test/unit/test_api_vlans.py b/test/unit/test_api_vlans.py
 +index 3849e6875374..7652ec936951 100644
 +--- a/test/unit/test_api_vlans.py
 ++++ b/test/unit/test_api_vlans.py
 +@@ -49,7 +49,7 @@ class TestApiVlans(EapiConfigUnitTest):
 +         self.config = open(get_fixture('running_config.text')).read()
 + 
 +     def test_isvlan_with_string(self):
 +-        self.assertFalse(pyeapi.api.vlans.isvlan(random_string()))
 ++        self.assertFalse(pyeapi.api.vlans.isvlan('a' + random_string()))
 + 
 +     def test_isvlan_valid_value(self):
 +         self.assertTrue(pyeapi.api.vlans.isvlan('1234'))
diff --cc debian/patches/0002-docs-napoleon-extension-is-included-in-Sphinx-since-.patch
index 0000000,0000000..d316721
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-docs-napoleon-extension-is-included-in-Sphinx-since-.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 000a361c6c1b6d1457de99032f9ad9fb73c8bbe6 Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Sun, 25 Sep 2016 17:39:23 +0200
++Subject: docs: "napoleon" extension is included in Sphinx since 1.3
++
++---
++ docs/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 39f076be1525..b89bc0ba521f 100755
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -35,7 +35,7 @@ extensions = [
++     'sphinx.ext.coverage',
++     'sphinx.ext.viewcode',
++     'sphinx.ext.doctest',
++-    'sphinxcontrib.napoleon'
+++    'sphinx.ext.napoleon'
++ ]
++ 
++ # Add any paths that contain templates here, relative to this directory.
diff --cc debian/patches/series
index 7b8b308,0000000..dc4c900
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
- 0001-Fix-test-case-when-random-is-a-valid-VLAN.patch
++0001-tests-fix-test-case-when-random-is-a-valid-VLAN.patch
++0002-docs-napoleon-extension-is-included-in-Sphinx-since-.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyeapi.git