pkgsrc-WIP-changes archive

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

py-cookiecutter: fix build with python-3.x.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Feb 24 10:05:09 2016 +0100
Changeset:	5b7ec23ed0e255adb9e708429597fad12c300dcf

Modified Files:
	py-cookiecutter/Makefile
	py-cookiecutter/distinfo
Added Files:
	py-cookiecutter/patches/patch-setup.py

Log Message:
py-cookiecutter: fix build with python-3.x.

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

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

diffstat:
 py-cookiecutter/Makefile               |  7 ++++---
 py-cookiecutter/distinfo               |  1 +
 py-cookiecutter/patches/patch-setup.py | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diffs:
diff --git a/py-cookiecutter/Makefile b/py-cookiecutter/Makefile
index 1d63961..4e78f7d 100644
--- a/py-cookiecutter/Makefile
+++ b/py-cookiecutter/Makefile
@@ -17,11 +17,9 @@ USE_TOOLS+=			make:build
 AUTO_MKDIRS=			yes
 INSTALLATION_DIRS+=		${PKGMANDIR}/man1/
 
-#UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 3550: ordinal not in range(128)
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35
-
 BUILD_DEPENDS+=			${PYPKGPREFIX}-sphinx>=1.2.3nb1:../../textproc/py-sphinx
 BUILD_DEPENDS+=			${PYPKGPREFIX}-chardet>=2.3.0:../../converters/py-chardet
+BUILD_DEPENDS+=			${PYPKGPREFIX}-test>=2.3.0:../../devel/py-test
 DEPENDS+=			${PYPKGPREFIX}-future>=0.15.2:../../wip/py-future
 DEPENDS+=			${PYPKGPREFIX}-binaryornot>=0.2.0:../../wip/py-binaryornot
 DEPENDS+=			${PYPKGPREFIX}-jinja2>=2.7:../../textproc/py-jinja2
@@ -47,6 +45,9 @@ post-build:
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/_build/man/cookiecutter.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 
+do-test:
+	cd ${WRKSRC} && py.test-${PYVERSSUFFIX}
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-cookiecutter/distinfo b/py-cookiecutter/distinfo
index e44f6f4..a3f433e 100644
--- a/py-cookiecutter/distinfo
+++ b/py-cookiecutter/distinfo
@@ -5,3 +5,4 @@ RMD160 (cookiecutter-1.3.0.zip) = 0f402dee6e5dd85b689dcc8c473fc755cd7d029b
 SHA512 (cookiecutter-1.3.0.zip) = 540300e917b1f91c9936d799e2ac3afd61ff8eb95639dc31dc61fd9aece6f9f283dd688a3ac780c5cb6eae299a85fbb89e1cf78cdefdd14501a9debff83eddfe
 Size (cookiecutter-1.3.0.zip) = 274125 bytes
 SHA1 (patch-docs_Makefile) = c0451b26ea79a8ebd7ca0f733264806fea84857d
+SHA1 (patch-setup.py) = 1fc0b739f9581011fb0c2a46bb2d56dc4ef68f8f
diff --git a/py-cookiecutter/patches/patch-setup.py b/py-cookiecutter/patches/patch-setup.py
new file mode 100644
index 0000000..c046a48
--- /dev/null
+++ b/py-cookiecutter/patches/patch-setup.py
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Set encoding for history file to make this build in C locales.
+
+--- setup.py.orig	2016-02-24 08:53:51.329247880 +0000
++++ setup.py
+@@ -23,7 +23,7 @@ if sys.argv[-1] == 'tag':
+ with open('README.rst') as readme_file:
+     readme = readme_file.read()
+ 
+-with open('HISTORY.rst') as history_file:
++with open('HISTORY.rst', encoding="utf-8") as history_file:
+     history = history_file.read().replace('.. :changelog:', '')
+ 
+ requirements = [


Home | Main Index | Thread Index | Old Index