[Python-modules-commits] [napalm-base] 04/05: 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 napalm-base.

commit a6469d4d261eb7a00e44f887920bf06fc0a4c531
Merge: 0a3b2ab 1453c97
Author: Vincent Bernat <bernat at debian.org>
Date:   Sun Dec 25 11:16:55 2016 +0100

    merge patched into master

 PKG-INFO                                           |   2 +-
 debian/.git-dpm                                    |   6 +-
 .../0001-Use-gtextfsm-instead-of-jtextfsm.patch    |  14 +-
 napalm_base.egg-info/PKG-INFO                      |   2 +-
 napalm_base.egg-info/SOURCES.txt                   |   3 +
 napalm_base.egg-info/entry_points.txt              |   1 +
 napalm_base.egg-info/requires.txt                  |   1 +
 napalm_base/base.py                                | 128 +++++++++++++++++-
 napalm_base/clitools/cl_napalm_configure.py        |   2 +-
 napalm_base/clitools/cl_napalm_test.py             |   6 +-
 .../{cl_napalm_test.py => cl_napalm_validate.py}   |  28 ++--
 napalm_base/clitools/helpers.py                    |  11 +-
 napalm_base/constants.py                           |  64 +++++++++
 napalm_base/exceptions.py                          |   4 +
 napalm_base/helpers.py                             |   1 +
 napalm_base/test/base.py                           |  39 ++++++
 napalm_base/test/conftest.py                       |  27 ++--
 napalm_base/test/double.py                         |   2 +-
 napalm_base/test/getters.py                        | 143 ++++++++++++++++-----
 napalm_base/test/models.py                         |  36 ++++++
 napalm_base/utils/string_parsers.py                |   5 +-
 napalm_base/validate.py                            | 125 ++++++++++++++++++
 requirements.txt                                   |   1 +
 setup.cfg                                          |  11 +-
 setup.py                                           |   5 +-
 25 files changed, 583 insertions(+), 84 deletions(-)

diff --cc debian/.git-dpm
index 6866462,0000000..6eb42ad
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
- fd2ab88250f3307fd386f8279301183c3640cec3
- fd2ab88250f3307fd386f8279301183c3640cec3
- b98c5980a5dad5d2c23b4c6939fbdcf7c0c92eb4
++1453c9765e2d8bb8e802fe946e97c41a4a732b4b
++1453c9765e2d8bb8e802fe946e97c41a4a732b4b
++1aa738594c35043d7f88c6115cd12bf12611dedf
 +1aa738594c35043d7f88c6115cd12bf12611dedf
 +napalm-base_0.21.0.orig.tar.gz
 +78c906fd14a1c0f550499fd5a8893822b84f8f7e
 +30820
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-gtextfsm-instead-of-jtextfsm.patch
index f3d53ea,0000000..2002be7
mode 100644,000000..100644
--- a/debian/patches/0001-Use-gtextfsm-instead-of-jtextfsm.patch
+++ b/debian/patches/0001-Use-gtextfsm-instead-of-jtextfsm.patch
@@@ -1,46 -1,0 +1,48 @@@
- From fd2ab88250f3307fd386f8279301183c3640cec3 Mon Sep 17 00:00:00 2001
++From 1453c9765e2d8bb8e802fe946e97c41a4a732b4b Mon Sep 17 00:00:00 2001
 +From: Vincent Bernat <vincent at bernat.im>
 +Date: Wed, 2 Nov 2016 19:44:23 +0100
 +Subject: Use gtextfsm instead of jtextfsm
 +
 +While gtextfsm is not compatible with Python 3, jtextfsm is not in
 +Debian and tests are failing with Python 2. Since the remaining of the
 +ecosystem is mostly Python 2 and the freeze is soon, let's use the
 +simpler solution.
 +---
 + napalm_base.egg-info/requires.txt | 2 +-
 + napalm_base/helpers.py            | 2 +-
 + requirements.txt                  | 2 +-
 + 3 files changed, 3 insertions(+), 3 deletions(-)
 +
 +diff --git a/napalm_base.egg-info/requires.txt b/napalm_base.egg-info/requires.txt
- index d8a6f3e5b4e1..695a0d602425 100644
++index 5760f0d9c35b..26fde49c5546 100644
 +--- a/napalm_base.egg-info/requires.txt
 ++++ b/napalm_base.egg-info/requires.txt
- @@ -1,3 +1,3 @@
++@@ -1,4 +1,4 @@
 +-jtextfsm
 ++gtextfsm
 + jinja2
 + netaddr
++ pyYAML
 +diff --git a/napalm_base/helpers.py b/napalm_base/helpers.py
- index 0dc3bfe9ce6b..61726373ee61 100644
++index ed7d63f57659..78b1a136db1d 100644
 +--- a/napalm_base/helpers.py
 ++++ b/napalm_base/helpers.py
 +@@ -10,7 +10,7 @@ import sys
 + 
 + # third party libs
 + import jinja2
 +-import jtextfsm as textfsm
 ++import textfsm
 + from netaddr import EUI
 + from netaddr import mac_unix
 + from netaddr import IPAddress
 +diff --git a/requirements.txt b/requirements.txt
- index d8a6f3e5b4e1..695a0d602425 100644
++index 5760f0d9c35b..26fde49c5546 100644
 +--- a/requirements.txt
 ++++ b/requirements.txt
- @@ -1,3 +1,3 @@
++@@ -1,4 +1,4 @@
 +-jtextfsm
 ++gtextfsm
 + jinja2
 + netaddr
++ pyYAML

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