[Python-modules-commits] [napalm-base] 02/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 3a59d571e1c7f66a7430887e6a276bf2fbd5aa30
Merge: 94326df fe790a7
Author: Vincent Bernat <bernat at debian.org>
Date:   Wed Nov 2 19:45:26 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 .../0001-Use-gtextfsm-instead-of-jtextfsm.patch    | 46 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 napalm_base.egg-info/requires.txt                  |  2 +-
 napalm_base/helpers.py                             |  2 +-
 requirements.txt                                   |  2 +-
 6 files changed, 52 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index ddbe1c9,0000000..c616a51
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
- b98c5980a5dad5d2c23b4c6939fbdcf7c0c92eb4
- b98c5980a5dad5d2c23b4c6939fbdcf7c0c92eb4
++fe790a74fc94d9e891164d6c47457cd5422bfacf
++fe790a74fc94d9e891164d6c47457cd5422bfacf
 +b98c5980a5dad5d2c23b4c6939fbdcf7c0c92eb4
 +b98c5980a5dad5d2c23b4c6939fbdcf7c0c92eb4
 +napalm-base_0.18.0.orig.tar.gz
 +56fd8a0bf34f49b9434d73ef72a35346d07b8df3
 +27160
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-gtextfsm-instead-of-jtextfsm.patch
index 0000000,0000000..2c3e334
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-gtextfsm-instead-of-jtextfsm.patch
@@@ -1,0 -1,0 +1,46 @@@
++From fe790a74fc94d9e891164d6c47457cd5422bfacf 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
++--- a/napalm_base.egg-info/requires.txt
+++++ b/napalm_base.egg-info/requires.txt
++@@ -1,3 +1,3 @@
++-jtextfsm
+++gtextfsm
++ jinja2
++ netaddr
++diff --git a/napalm_base/helpers.py b/napalm_base/helpers.py
++index 0dc3bfe9ce6b..47c75ac38852 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 gtextfsm as 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
++--- a/requirements.txt
+++++ b/requirements.txt
++@@ -1,3 +1,3 @@
++-jtextfsm
+++gtextfsm
++ jinja2
++ netaddr
diff --cc debian/patches/series
index 0000000,0000000..62d9910
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-gtextfsm-instead-of-jtextfsm.patch

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