pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-dnspython: fix package



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Mar 10 16:21:11 2017 +0100
Changeset:	283b1433e65a968929c433d2a76faa78f9d76d66

Modified Files:
	py-dnspython/Makefile
	py-dnspython/PLIST
	py-dnspython/distinfo
Added Files:
	py-dnspython/patches/patch-tests_test__zone.py

Log Message:
py-dnspython: fix package

Use egg.mk so setuptools is installed and used.
Fix a failing test using upstream commit.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=283b1433e65a968929c433d2a76faa78f9d76d66

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-dnspython/Makefile                          |  2 +-
 py-dnspython/PLIST                             |  8 ++++----
 py-dnspython/distinfo                          |  1 +
 py-dnspython/patches/patch-tests_test__zone.py | 19 +++++++++++++++++++
 4 files changed, 25 insertions(+), 5 deletions(-)

diffs:
diff --git a/py-dnspython/Makefile b/py-dnspython/Makefile
index 2818c46c3c..983a29aa88 100644
--- a/py-dnspython/Makefile
+++ b/py-dnspython/Makefile
@@ -11,5 +11,5 @@ HOMEPAGE=	http://www.dnspython.org/
 COMMENT=	DNS toolkit for Python
 #LICENSE=	# TODO: (see mk/license.mk) # distinct, similar to isc
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-dnspython/PLIST b/py-dnspython/PLIST
index 40c033e8f8..2d0a366534 100644
--- a/py-dnspython/PLIST
+++ b/py-dnspython/PLIST
@@ -1,4 +1,8 @@
 @comment $NetBSD$
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/dns/__init__.py
 ${PYSITELIB}/dns/__init__.pyc
 ${PYSITELIB}/dns/__init__.pyo
@@ -278,7 +282,3 @@ ${PYSITELIB}/dns/wiredata.pyo
 ${PYSITELIB}/dns/zone.py
 ${PYSITELIB}/dns/zone.pyc
 ${PYSITELIB}/dns/zone.pyo
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
diff --git a/py-dnspython/distinfo b/py-dnspython/distinfo
index 57ddf7bee0..1e99d70f92 100644
--- a/py-dnspython/distinfo
+++ b/py-dnspython/distinfo
@@ -4,3 +4,4 @@ SHA1 (dnspython-1.15.0.zip) = 2a3ffd70c0dbcac5ab60b582b5c53d202a938570
 RMD160 (dnspython-1.15.0.zip) = 891ac558c723e12deab5445dbf0545731df7ca9f
 SHA512 (dnspython-1.15.0.zip) = 942f7cf083d1b0a9f03f040ceca194c38777f2e40862c388051986112b3f2a4a8426733ff46ec5a155319776e4a856412c3430b052b2f92f251f0e3260eb9bc1
 Size (dnspython-1.15.0.zip) = 252157 bytes
+SHA1 (patch-tests_test__zone.py) = 724f4eba20ad996abb02fd317c8ac8269d89ead7
diff --git a/py-dnspython/patches/patch-tests_test__zone.py b/py-dnspython/patches/patch-tests_test__zone.py
new file mode 100644
index 0000000000..693d90d715
--- /dev/null
+++ b/py-dnspython/patches/patch-tests_test__zone.py
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Test creates file in wrong location
+
+test_zone.ZoneTestCase.testToFileFilename fails with OSError: [Errno 2] No such file or directory
+
+https://github.com/rthalley/dnspython/pull/210/commits/0add1649c91b4f56b32e73c3a6327519c6eb532e
+
+--- tests/test_zone.py.orig	2016-09-20 09:24:02.000000000 +0000
++++ tests/test_zone.py
+@@ -177,7 +177,7 @@ class ZoneTestCase(unittest.TestCase):
+     def testToFileFilename(self):
+         z = dns.zone.from_file(here('example'), 'example')
+         try:
+-            z.to_file('example3-filename.out')
++            z.to_file(here('example3-filename.out'))
+             ok = filecmp.cmp(here('example3-filename.out'),
+                              here('example3.good'))
+         finally:


Home | Main Index | Thread Index | Old Index