pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Add patch for setup.py in order to correct utf8 issue
Module Name: pkgsrc-wip
Committed By: Guillaume Delpierre <gde%llew.me@localhost>
Pushed By: gdelpierre
Date: Wed Feb 24 14:51:15 2016 +0100
Changeset: bb6be8b418861341aac4bbd9cc8b8f0d58655b2e
Modified Files:
py-cookiecutter/Makefile
py-cookiecutter/distinfo
py-cookiecutter/patches/patch-setup.py
Log Message:
Add patch for setup.py in order to correct utf8 issue
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bb6be8b418861341aac4bbd9cc8b8f0d58655b2e
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
py-cookiecutter/Makefile | 5 +++--
py-cookiecutter/distinfo | 2 +-
py-cookiecutter/patches/patch-setup.py | 27 ++++++++++++++++-----------
3 files changed, 20 insertions(+), 14 deletions(-)
diffs:
diff --git a/py-cookiecutter/Makefile b/py-cookiecutter/Makefile
index 4e78f7d..967b589 100644
--- a/py-cookiecutter/Makefile
+++ b/py-cookiecutter/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= ${MASTER_SITE_GITHUB:=audreyr/cookiecutter/}
COMMENT= Command-line utility that creates projects from project templates
LICENSE= modified-bsd
-USE_LANGUAGES= #none
+USE_LANGUAGES= c
USE_TOOLS+= make:build
AUTO_MKDIRS= yes
INSTALLATION_DIRS+= ${PKGMANDIR}/man1/
@@ -23,9 +23,10 @@ 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
-DEPENDS+= ${PYPKGPREFIX}-click>=5.0:../../devel/py-click
+DEPENDS+= ${PYPKGPREFIX}-click>=6.3:../../wip/py-click
DEPENDS+= ${PYPKGPREFIX}-whichcraft>=0.1.1:../../wip/py-whichcraft
DEPENDS+= ${PYPKGPREFIX}-ruamel-yaml>=0.10.12:../../wip/py-ruamel-yaml
+DEPENDS+= ${PYPKGPREFIX}-markupsafe:../../textproc/py-markupsafe
# for python < 3.0
.include "../../lang/python/pyversion.mk"
diff --git a/py-cookiecutter/distinfo b/py-cookiecutter/distinfo
index 36a6f95..2713389 100644
--- a/py-cookiecutter/distinfo
+++ b/py-cookiecutter/distinfo
@@ -5,4 +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) = 3e8a4fd35cd146454b3837a3688e875f13e07d84
+SHA1 (patch-setup.py) = df288ff002a52fcb1c9bcaa5eaa88f60d3394b5a
diff --git a/py-cookiecutter/patches/patch-setup.py b/py-cookiecutter/patches/patch-setup.py
index c85f3e5..4398957 100644
--- a/py-cookiecutter/patches/patch-setup.py
+++ b/py-cookiecutter/patches/patch-setup.py
@@ -1,16 +1,21 @@
-$NetBSD$
-
-Set encoding for history file to make this build in C locales.
-https://github.com/audreyr/cookiecutter/pull/638
-
---- setup.py.orig 2016-02-24 08:53:51.329247880 +0000
-+++ setup.py
-@@ -23,7 +23,7 @@ if sys.argv[-1] == 'tag':
+--- setup.py.orig 2016-02-16 08:36:10.000000000 +0100
++++ setup.py 2016-02-16 08:34:17.000000000 +0100
+@@ -23,9 +23,6 @@
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:', '')
-
+- history = history_file.read().replace('.. :changelog:', '')
+-
requirements = [
+ 'future>=0.15.2',
+ 'binaryornot>=0.2.0',
+@@ -34,7 +31,7 @@
+ 'whichcraft>=0.1.1'
+ ]
+
+-long_description = readme + '\n\n' + history
++long_description = readme
+
+ if sys.argv[-1] == 'readme':
+ print(long_description)
Home |
Main Index |
Thread Index |
Old Index