Control: tags 915749 + patch
Control: tags 937460 + patch

Dear maintainer,

I've prepared an NMU for pyiosxr (versioned as 0.52-1.1). The diff
is attached to this message.

I've uploaded it directly to sid as it fixes an RC bug more than 9 months old.

I tried to build from the DPMT git, but for some reason the patch was always
gettin rejected, while it works out of simple debuild..

Regards.

diff -Nru pyiosxr-0.52/debian/changelog pyiosxr-0.52/debian/changelog
--- pyiosxr-0.52/debian/changelog	2017-11-12 14:18:39.000000000 -0500
+++ pyiosxr-0.52/debian/changelog	2019-10-13 00:56:59.000000000 -0400
@@ -1,3 +1,12 @@
+pyiosxr (0.52-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/675bba17d3af7de14d0db52c01a83b7cc163e59e.patch
+    - fix compatibility with pip >= 10; Closes: #915749
+  * Drop python2 support; Closes: #937460
+
+ -- Sandro Tosi <[email protected]>  Sun, 13 Oct 2019 00:56:59 -0400
+
 pyiosxr (0.52-1) unstable; urgency=medium
 
   * New upstream version.
diff -Nru pyiosxr-0.52/debian/control pyiosxr-0.52/debian/control
--- pyiosxr-0.52/debian/control	2017-11-12 14:18:39.000000000 -0500
+++ pyiosxr-0.52/debian/control	2019-10-13 00:56:28.000000000 -0400
@@ -4,32 +4,18 @@
 Maintainer: Vincent Bernat <[email protected]>
 Uploaders: Debian Python Modules Team <[email protected]>
 Build-Depends: debhelper (>= 9), dh-python,
-               python-all, python3-all,
-               python-pexpect, python3-pexpect,
-               python-setuptools, python3-setuptools,
-               python-pip, python3-pip,
-               python-mock, python3-mock,
-               python-lxml, python3-lxml,
-               python-netmiko, python3-netmiko,
+               python3-all,
+               python3-pexpect,
+               python3-setuptools,
+               python3-pip,
+               python3-mock,
+               python3-lxml,
+               python3-netmiko,
 Standards-Version: 4.1.1
 Homepage: https://github.com/fooelisa/pyiosxr/
 Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/pyiosxr.git
 Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/pyiosxr.git
 
-Package: python-pyiosxr
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends},
-Recommends: ${python:Recommends}
-Suggests: ${python:Suggests}
-XB-Python-Egg-Name: pyIOSXR
-Description: Python API for Cisco IOX-XR network devices (Python 2)
- This package provides a Python API to connect to network devices
- running Cisco IOS-XR. It can retrieve several information like
- interfaces. It can also modify the current configuration and execute
- arbitrary commands.
- .
- This package contains the Python 2 version.
-
 Package: python3-pyiosxr
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends},
diff -Nru pyiosxr-0.52/debian/patches/675bba17d3af7de14d0db52c01a83b7cc163e59e.patch pyiosxr-0.52/debian/patches/675bba17d3af7de14d0db52c01a83b7cc163e59e.patch
--- pyiosxr-0.52/debian/patches/675bba17d3af7de14d0db52c01a83b7cc163e59e.patch	1969-12-31 19:00:00.000000000 -0500
+++ pyiosxr-0.52/debian/patches/675bba17d3af7de14d0db52c01a83b7cc163e59e.patch	2019-10-13 00:29:26.000000000 -0400
@@ -0,0 +1,31 @@
+From b63443b4d09890a1de2b64b805ec4104a3ae1c36 Mon Sep 17 00:00:00 2001
+From: Patrick Ogenstad <[email protected]>
+Date: Sun, 15 Apr 2018 06:31:57 +0200
+Subject: [PATCH] Fix installation issue with pip 10, test on py3.6
+
+---
+ setup.py    | 9 ++-------
+ 2 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index b1f7568..290911b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -18,15 +18,10 @@
+ # the License.
+ 
+ from setuptools import setup, find_packages
+-from pip.req import parse_requirements
+-import uuid
+ 
+-# parse_requirements() returns generator of pip.req.InstallRequirement objects
+-install_reqs = parse_requirements('requirements.txt', session=uuid.uuid1())
+ 
+-# reqs is a list of requirement
+-# e.g. ['django==1.5.1', 'mezzanine==1.4.6']
+-reqs = [str(ir.req) for ir in install_reqs]
++with open("requirements.txt", "r") as fs:
++    reqs = [r for r in fs.read().splitlines() if (len(r) > 0 and not r.startswith("#"))]
+ 
+ version = '0.52'
+ 
diff -Nru pyiosxr-0.52/debian/patches/series pyiosxr-0.52/debian/patches/series
--- pyiosxr-0.52/debian/patches/series	1969-12-31 19:00:00.000000000 -0500
+++ pyiosxr-0.52/debian/patches/series	2019-10-13 00:46:25.000000000 -0400
@@ -0,0 +1 @@
+675bba17d3af7de14d0db52c01a83b7cc163e59e.patch
diff -Nru pyiosxr-0.52/debian/rules pyiosxr-0.52/debian/rules
--- pyiosxr-0.52/debian/rules	2017-11-12 14:18:39.000000000 -0500
+++ pyiosxr-0.52/debian/rules	2019-10-13 00:56:34.000000000 -0400
@@ -2,4 +2,4 @@
 
 export PYBUILD_NAME=pyiosxr
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python3 --buildsystem=pybuild

Reply via email to