CVS commit: pkgsrc/devel

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Aug 27 12:27:00 UTC 2020

Modified Files:
        pkgsrc/devel/py-curtsies: distinfo
        pkgsrc/devel/py-test-xdist: distinfo
Added Files:
        pkgsrc/devel/py-curtsies/patches: patch-setup.py
        pkgsrc/devel/py-test-xdist/patches: patch-setup.py

Log Message:
Fix Python 3.6 build


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-curtsies/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/devel/py-curtsies/patches/patch-setup.py
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/py-test-xdist/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/py-test-xdist/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/devel/py-curtsies/distinfo
diff -u pkgsrc/devel/py-curtsies/distinfo:1.6 pkgsrc/devel/py-curtsies/distinfo:1.7
--- pkgsrc/devel/py-curtsies/distinfo:1.6       Thu Jul 16 06:08:13 2020
+++ pkgsrc/devel/py-curtsies/distinfo   Thu Aug 27 12:26:59 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2020/07/16 06:08:13 adam Exp $
+$NetBSD: distinfo,v 1.7 2020/08/27 12:26:59 joerg Exp $
 
 SHA1 (curtsies-0.3.4.tar.gz) = 336b54a640a02d398ad7bfc8e93d6b8d0ae81be9
 RMD160 (curtsies-0.3.4.tar.gz) = a9839baf73fe50b367899243ee22006cac16d5f1
 SHA512 (curtsies-0.3.4.tar.gz) = 5f65af34f6dd13491acf65311516ed90e57d99f681032ab6b4753710953f5285b012a09de6c56d28ccd5bc942c9886076f04287cddf955ba424205a5c44785b2
 Size (curtsies-0.3.4.tar.gz) = 52733 bytes
+SHA1 (patch-setup.py) = 1d1e21ac1bb8f3a308a1466a53d32c0c253d0515

Index: pkgsrc/devel/py-test-xdist/distinfo
diff -u pkgsrc/devel/py-test-xdist/distinfo:1.27 pkgsrc/devel/py-test-xdist/distinfo:1.28
--- pkgsrc/devel/py-test-xdist/distinfo:1.27    Wed Jul 29 14:36:47 2020
+++ pkgsrc/devel/py-test-xdist/distinfo Thu Aug 27 12:26:59 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.27 2020/07/29 14:36:47 adam Exp $
+$NetBSD: distinfo,v 1.28 2020/08/27 12:26:59 joerg Exp $
 
 SHA1 (pytest-xdist-1.34.0.tar.gz) = 1a21d930c43d9b163a99d560e7169d0d4b6f88a1
 RMD160 (pytest-xdist-1.34.0.tar.gz) = 035f6bfa33e2225fc4d4bdde5b21c02e7314e22f
 SHA512 (pytest-xdist-1.34.0.tar.gz) = 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
 Size (pytest-xdist-1.34.0.tar.gz) = 66151 bytes
+SHA1 (patch-setup.py) = b04fc9f42ec7ec659b993d70760c981a5884e584

Added files:

Index: pkgsrc/devel/py-curtsies/patches/patch-setup.py
diff -u /dev/null pkgsrc/devel/py-curtsies/patches/patch-setup.py:1.3
--- /dev/null   Thu Aug 27 12:27:00 2020
+++ pkgsrc/devel/py-curtsies/patches/patch-setup.py     Thu Aug 27 12:26:59 2020
@@ -0,0 +1,22 @@
+$NetBSD: patch-setup.py,v 1.3 2020/08/27 12:26:59 joerg Exp $
+
+--- setup.py.orig      2020-08-26 11:44:55.860904637 +0000
++++ setup.py
+@@ -2,7 +2,7 @@ from setuptools import setup
+ import ast
+ import os
+ import io
+-
++import sys
+ 
+ def version():
+     """Return version string."""
+@@ -16,7 +16,7 @@ setup(
+     name="curtsies",
+     version=version(),
+     description="Curses-like terminal wrapper, with colored strings!",
+-    long_description=open("readme.md", encoding="utf-8").read(),
++    long_description=open("readme.md", **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})).read(),
+     long_description_content_type="text/markdown",
+     url="https://github.com/bpython/curtsies";,
+     author="Thomas Ballinger",

Index: pkgsrc/devel/py-test-xdist/patches/patch-setup.py
diff -u /dev/null pkgsrc/devel/py-test-xdist/patches/patch-setup.py:1.1
--- /dev/null   Thu Aug 27 12:27:00 2020
+++ pkgsrc/devel/py-test-xdist/patches/patch-setup.py   Thu Aug 27 12:27:00 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-setup.py,v 1.1 2020/08/27 12:27:00 joerg Exp $
+
+--- setup.py.orig      2020-08-26 11:53:27.731267998 +0000
++++ setup.py
+@@ -1,9 +1,10 @@
+ from setuptools import setup, find_packages
++import sys
+ 
+ install_requires = ["execnet>=1.1", "pytest>=4.4.0", "pytest-forked", "six"]
+ 
+ 
+-with open("README.rst") as f:
++with open("README.rst", **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as f:
+     long_description = f.read()
+ 
+ setup(