Revised patch based on Daniel's suggestions.
________________________________
发件人: Brian Callahan <bcal...@protonmail.com>
发送时间: 2021年1月20日 11:41
收件人: Daniel Dickman <didick...@gmail.com>
抄送: wen heping <wenheping2...@hotmail.com>; Brian Callahan
<bcal...@openbsd.org>; ports@openbsd.org <ports@openbsd.org>
主题: Re: 回复: [Update] devel/bpython : Update to 0.20.1
Hello Wen --
On Tuesday, January 19, 2021 10:36 PM, Daniel Dickman <didick...@gmail.com>
wrote:
> On Wed, 20 Jan 2021, wen heping wrote:
>
> > Thank your suggestion.
> > wcwidthis a DEPENDS of devel/py-curtsies, so it could be added
> > automatically.
>
> I'm not a huge fan of this implicit approach.
>
> > minimum version check on py-curtsies would be failed because we have
> > curtsies-0.3.1 in portstree.
>
> that's fine the version check is for 0.3.0 or greater, which the current
> tree satisfies. If someone has an older version around for some reason...
> the check will help.
>
> > But I shall submitted another patch to update curtsies.
> > I shall send a revised patch based on your suggestions later.
>
> no update for curtsies needed.
I'll second everything Daniel said and I'll take a look at the revised
submission when it arrives.
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/bpython/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 3 Jul 2020 21:12:38 -0000 1.28
+++ Makefile 20 Jan 2021 07:25:35 -0000
@@ -2,10 +2,9 @@
COMMENT= fancy interface to the Python interpreter
-MODPY_EGG_VERSION=0.18
+MODPY_EGG_VERSION=0.20.1
DISTNAME= bpython-${MODPY_EGG_VERSION}
CATEGORIES= devel
-REVISION= 1
HOMEPAGE= https://bpython-interpreter.org/
MAINTAINER= Brian Callahan <bcal...@openbsd.org>
@@ -23,10 +22,11 @@ FLAVORS= python3
FLAVOR= python3
RUN_DEPENDS= devel/desktop-file-utils \
- devel/py-curtsies${MODPY_FLAVOR} \
+ devel/py-curtsies${MODPY_FLAVOR}>=0.3.0 \
devel/py-greenlet${MODPY_FLAVOR} \
devel/py-six${MODPY_FLAVOR} \
devel/py-urwid${MODPY_FLAVOR} \
+ devel/py-wcwidth${MODPY_FLAVOR} \
textproc/py-pygments${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR}
BUILD_DEPENDS= devel/py-babel${MODPY_FLAVOR} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/bpython/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 9 Aug 2019 00:00:40 -0000 1.9
+++ distinfo 20 Jan 2021 07:25:35 -0000
@@ -1,2 +1,2 @@
-SHA256 (bpython-0.18.tar.gz) = Vswg2+VoyYyB3kmQ/d9YYsDY06sK0c9wV5iKvF92hsI=
-SIZE (bpython-0.18.tar.gz) = 213321
+SHA256 (bpython-0.20.1.tar.gz) = bnc4gGATtGm+V7ARcIK5xFV+18kscM63n5bWdNicdQM=
+SIZE (bpython-0.20.1.tar.gz) = 223953
Index: patches/patch-bpython_test_test_args_py
===================================================================
RCS file: /cvs/ports/devel/bpython/patches/patch-bpython_test_test_args_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-bpython_test_test_args_py
--- patches/patch-bpython_test_test_args_py 22 Sep 2019 21:46:07 -0000
1.1
+++ patches/patch-bpython_test_test_args_py 20 Jan 2021 07:25:35 -0000
@@ -5,27 +5,27 @@ Skip three tests that just hang forever
Index: bpython/test/test_args.py
--- bpython/test/test_args.py.orig
+++ bpython/test/test_args.py
-@@ -20,6 +20,7 @@ except ImportError:
+@@ -22,6 +22,7 @@ except ImportError:
- @attr(speed='slow')
+ @attr(speed="slow")
class TestExecArgs(unittest.TestCase):
+ @unittest.skip("hangs under OpenBSD")
def test_exec_dunder_file(self):
with tempfile.NamedTemporaryFile(mode="w") as f:
- f.write(dedent("""\
-@@ -37,6 +38,7 @@ class TestExecArgs(unittest.TestCase):
+ f.write(
+@@ -42,6 +43,7 @@ class TestExecArgs(unittest.TestCase):
self.assertEqual(stderr.strip(), f.name)
+ @unittest.skip("hangs under OpenBSD")
def test_exec_nonascii_file(self):
with tempfile.NamedTemporaryFile(mode="w") as f:
- f.write(dedent('''\
-@@ -52,6 +54,7 @@ class TestExecArgs(unittest.TestCase):
+ f.write(
+@@ -61,6 +63,7 @@ class TestExecArgs(unittest.TestCase):
except subprocess.CalledProcessError:
- self.fail('Error running module with nonascii characters')
+ self.fail("Error running module with nonascii characters")
+ @unittest.skip("hangs under OpenBSD")
def test_exec_nonascii_file_linenums(self):
with tempfile.NamedTemporaryFile(mode="w") as f:
- f.write(dedent("""\
+ f.write(
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/bpython/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 29 Mar 2020 18:45:52 -0000 1.10
+++ pkg/PLIST 20 Jan 2021 07:25:35 -0000
@@ -117,6 +117,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_curtsies_repl.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_filewatch.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_history.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_import_not_cyclical.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_importcompletion.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_inspection.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/bpython/test/${MODPY_PYCACHE}test_interpreter.${MODPY_PYC_MAGIC_TAG}pyc
@@ -153,6 +154,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/bpython/test/test_curtsies_repl.py
lib/python${MODPY_VERSION}/site-packages/bpython/test/test_filewatch.py
lib/python${MODPY_VERSION}/site-packages/bpython/test/test_history.py
+lib/python${MODPY_VERSION}/site-packages/bpython/test/test_import_not_cyclical.py
lib/python${MODPY_VERSION}/site-packages/bpython/test/test_importcompletion.py
lib/python${MODPY_VERSION}/site-packages/bpython/test/test_inspection.py
lib/python${MODPY_VERSION}/site-packages/bpython/test/test_interpreter.py
