Unbreaks py 3.7. No problems seen with dependent ports. OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-pexpect/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 25 Mar 2019 14:29:51 -0000 1.28
+++ Makefile 23 Apr 2019 12:43:03 -0000
@@ -2,13 +2,12 @@
COMMENT= pure Python Expect-like module
-MODPY_EGG_VERSION= 4.2.1
+MODPY_EGG_VERSION= 4.7.0
DISTNAME= pexpect-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= devel
-REVISION= 0
-HOMEPAGE= http://pexpect.sourceforge.net/
+HOMEPAGE= https://pexpect.readthedocs.io/
MAINTAINER = Alexandr Shadchin <[email protected]>
@@ -46,6 +45,11 @@ pre-build:
post-build:
cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html \
SPHINXBUILD=${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX}
+
+# py2: pexpect/_async.py doesn't compile on py2, however it is not used there
+# either. upstream won't fix (https://github.com/pexpect/pexpect/issues/290)
+# so MODPY_COMMENT is used in the PLIST to avoid installing this file (and
+# especially the related pyc file which is not produced due to the failure).
post-install:
${INSTALL_DATA_DIR} ${EXAMPLESDIR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-pexpect/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 1 Sep 2016 06:56:46 -0000 1.11
+++ distinfo 23 Apr 2019 12:43:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (pexpect-4.2.1.tar.gz) = PRMkZadbV6qBg0HGUhOSoGzGYP6zmI1/EHTzm9I8mpI=
-SIZE (pexpect-4.2.1.tar.gz) = 143980
+SHA256 (pexpect-4.7.0.tar.gz) = niwf0ObuOkmyj5XUszvDicibIK9qElWQbpD/EmLOYus=
+SIZE (pexpect-4.7.0.tar.gz) = 153747
Index: patches/patch-pexpect_replwrap_py
===================================================================
RCS file: /cvs/ports/devel/py-pexpect/patches/patch-pexpect_replwrap_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-pexpect_replwrap_py
--- patches/patch-pexpect_replwrap_py 7 Jan 2016 17:16:21 -0000 1.1
+++ patches/patch-pexpect_replwrap_py 23 Apr 2019 12:43:03 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-pexpect_replwrap_py,v 1.1 2016/01/07 17:16:21 shadchin Exp $
---- pexpect/replwrap.py.orig Wed Dec 30 11:46:48 2015
-+++ pexpect/replwrap.py Wed Dec 30 11:52:00 2015
-@@ -100,7 +100,7 @@ class REPLWrapper(object):
+Index: pexpect/replwrap.py
+--- pexpect/replwrap.py.orig
++++ pexpect/replwrap.py
+@@ -108,7 +108,7 @@ class REPLWrapper(object):
+ command)
return u''.join(res + [self.child.before])
Index: patches/patch-tests_test_performance_py
===================================================================
RCS file: /cvs/ports/devel/py-pexpect/patches/patch-tests_test_performance_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tests_test_performance_py
--- patches/patch-tests_test_performance_py 7 Jan 2016 17:16:21 -0000
1.1
+++ patches/patch-tests_test_performance_py 23 Apr 2019 12:43:03 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-tests_test_performance_py,v 1.1 2016/01/07 17:16:21 shadchin
Exp $
---- tests/test_performance.py.orig Wed Dec 30 00:45:19 2015
-+++ tests/test_performance.py Wed Dec 30 00:46:18 2015
-@@ -44,7 +44,7 @@ class PerformanceTestCase (PexpectTestCase.PexpectTest
+Index: tests/test_performance.py
+--- tests/test_performance.py.orig
++++ tests/test_performance.py
+@@ -45,7 +45,7 @@ class PerformanceTestCase (PexpectTestCase.PexpectTest
return 'for n in range(1, %d+1): print(n)' % n
def plain_range(self, n):
@@ -10,7 +11,7 @@ $OpenBSD: patch-tests_test_performance_p
self.assertEqual(e.expect(b'>>>'), 0)
e.sendline(self._iter_n(n))
self.assertEqual(e.expect(br'\.{3}'), 0)
-@@ -52,7 +52,7 @@ class PerformanceTestCase (PexpectTestCase.PexpectTest
+@@ -53,7 +53,7 @@ class PerformanceTestCase (PexpectTestCase.PexpectTest
self.assertEqual(e.expect([b'inquisition', '%d' % n]), 1)
def window_range(self, n):
@@ -19,7 +20,7 @@ $OpenBSD: patch-tests_test_performance_p
self.assertEqual(e.expect(b'>>>'), 0)
e.sendline(self._iter_n(n))
self.assertEqual(e.expect(r'\.{3}'), 0)
-@@ -60,7 +60,7 @@ class PerformanceTestCase (PexpectTestCase.PexpectTest
+@@ -61,7 +61,7 @@ class PerformanceTestCase (PexpectTestCase.PexpectTest
self.assertEqual(e.expect([b'inquisition', '%d' % n],
searchwindowsize=20), 1)
def exact_range(self, n):
@@ -28,7 +29,7 @@ $OpenBSD: patch-tests_test_performance_p
self.assertEqual(e.expect_exact([b'>>>']), 0)
e.sendline(self._iter_n(n))
self.assertEqual(e.expect_exact([b'...']), 0)
-@@ -68,7 +68,7 @@ class PerformanceTestCase (PexpectTestCase.PexpectTest
+@@ -69,7 +69,7 @@ class PerformanceTestCase (PexpectTestCase.PexpectTest
self.assertEqual(e.expect_exact([b'inquisition', '%d' %
n],timeout=520), 1)
def ewin_range(self, n):
@@ -37,7 +38,7 @@ $OpenBSD: patch-tests_test_performance_p
self.assertEqual(e.expect_exact([b'>>>']), 0)
e.sendline(self._iter_n(n))
self.assertEqual(e.expect_exact([b'...']), 0)
-@@ -76,7 +76,7 @@ class PerformanceTestCase (PexpectTestCase.PexpectTest
+@@ -77,7 +77,7 @@ class PerformanceTestCase (PexpectTestCase.PexpectTest
self.assertEqual(e.expect_exact([b'inquisition', '%d' % n],
searchwindowsize=20), 1)
def faster_range(self, n):
Index: patches/patch-tests_test_replwrap_py
===================================================================
RCS file: /cvs/ports/devel/py-pexpect/patches/patch-tests_test_replwrap_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-tests_test_replwrap_py
--- patches/patch-tests_test_replwrap_py 1 Sep 2016 06:56:46 -0000
1.2
+++ patches/patch-tests_test_replwrap_py 23 Apr 2019 12:43:03 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-tests_test_replwrap_py,v 1.2 2016/09/01 06:56:46 shadchin Exp $
---- tests/test_replwrap.py.orig Mon Aug 22 00:57:33 2016
-+++ tests/test_replwrap.py Sun Aug 28 17:27:51 2016
-@@ -101,7 +101,7 @@ class REPLWrapTestCase(unittest.TestCase):
+Index: tests/test_replwrap.py
+--- tests/test_replwrap.py.orig
++++ tests/test_replwrap.py
+@@ -108,7 +108,7 @@ class REPLWrapTestCase(unittest.TestCase):
if platform.python_implementation() == 'PyPy':
raise unittest.SkipTest(skip_pypy)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-pexpect/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 1 Sep 2016 06:56:46 -0000 1.11
+++ pkg/PLIST 23 Apr 2019 12:43:03 -0000
@@ -8,7 +8,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}ANSI.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}FSM.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}async.${MODPY_PYC_MAGIC_TAG}pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}_async.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}expect.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}fdpexpect.${MODPY_PYC_MAGIC_TAG}pyc
@@ -20,7 +20,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}screen.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}spawnbase.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pexpect/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pexpect/async.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pexpect/_async.py
lib/python${MODPY_VERSION}/site-packages/pexpect/bashrc.sh
lib/python${MODPY_VERSION}/site-packages/pexpect/exceptions.py
lib/python${MODPY_VERSION}/site-packages/pexpect/expect.py
