[Git][debian-gis-team/pyshp][master] 2 commits: Add patch to fix setup.py with Python 2.7.

Bas Couwenberg gitlab at salsa.debian.org
Mon Nov 5 07:31:36 GMT 2018


Bas Couwenberg pushed to branch master at Debian GIS Project / pyshp


Commits:
3b749dfc by Bas Couwenberg at 2018-11-05T07:19:14Z
Add patch to fix setup.py with Python 2.7.

- - - - -
4985a1ba by Bas Couwenberg at 2018-11-05T07:22:38Z
Set distribution to experimental.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/series
- + debian/patches/setup-py2.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,13 @@
-pyshp (2.0.0+ds-1) UNRELEASED; urgency=medium
+pyshp (2.0.0+ds-1~exp1) experimental; urgency=medium
 
+  * Team upload.
   * New upstream release.
   * Bump Standards-Version to 4.2.1, no changes.
   * Drop autopkgtests to test installability & module import.
   * Add lintian override for testsuite-autopkgtest-missing.
+  * Add patch to fix setup.py with Python 2.7.
 
- -- Bas Couwenberg <sebastic at debian.org>  Mon, 05 Nov 2018 07:31:39 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 05 Nov 2018 08:19:18 +0100
 
 pyshp (1.2.12+ds-2) unstable; urgency=medium
 


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+setup-py2.patch


=====================================
debian/patches/setup-py2.patch
=====================================
@@ -0,0 +1,36 @@
+Description: Fix setup.py failure with Python 2.7.
+ I: pybuild base:184: python3.5 setup.py clean
+ Traceback (most recent call last):
+   File "setup.py", line 6, in <module>
+     long_description=open('README.md').read(),
+   File "/usr/lib/python3.5/encodings/ascii.py", line 26, in decode
+     return codecs.ascii_decode(input, self.errors)[0]
+ UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 37236: ordinal not in range(128)
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/GeospatialPython/pyshp/pull/171
+
+--- a/setup.py
++++ b/setup.py
+@@ -1,9 +1,21 @@
++import codecs
++import sys
++
+ from setuptools import setup
+ 
++
++PYTHON3 = sys.version_info[0] == 3
++
++def read_file(file):
++    if PYTHON3:
++        return open(file, encoding='utf-8').read()
++    else:
++        return codecs.open(file, encoding='utf-8').read()
++
+ setup(name='pyshp',
+       version='2.0.0',
+       description='Pure Python read/write support for ESRI Shapefile format',
+-      long_description=open('README.md').read(),
++      long_description=read_file('README.md'),
+       author='Joel Lawhead',
+       author_email='jlawhead at geospatialpython.com',
+       url='https://github.com/GeospatialPython/pyshp',



View it on GitLab: https://salsa.debian.org/debian-gis-team/pyshp/compare/abb16aa96ac1dddc21f678c5280b056890564252...4985a1ba0cd95a4f597e47f51d8d36f332059026

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/pyshp/compare/abb16aa96ac1dddc21f678c5280b056890564252...4985a1ba0cd95a4f597e47f51d8d36f332059026
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181105/1fba3e29/attachment-0001.html>


More information about the Pkg-grass-devel mailing list