From nobody Mon Nov 27 18:09:13 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfDB13x7Nz52N2Z; Mon, 27 Nov 2023 18:09:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfDB13JJ7z4RF3; Mon, 27 Nov 2023 18:09:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701108553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dJQl4O9U/VvZTIC7iJqvzkMi5QnadT22i9SPyTvUprk=; b=WAYxc9/kJI0IAsl8ZsUznkVctiEqqmk6Y2GjcFDr61KHGu/0pjn1vlF93qlFZJsD/rVp2g sfI1t3imaO8+tibXDj4ITtv11DSBrwpazc+rs5VZKW6m4Vq1fGYMSTiRnVg34SmY3+mq7B OdnhxVCj6rC3m5jlQ6zd0mZ/4O9WYKtXtt2atl9wfGF3wVkTr/9Zd7LG2gBoXUzb+5yzma P0i2V/jzvwT+3H4adFrX5Hb8vPwKmmNq+hXkBQ2bwRCoDw+8+iEAr2CVP2i+iaZJcdR9Dc DaPRdQCRcURIDQP2RDwa69mJh222rIqEST4yb3jSOqk0E9JhxO2iexictjDhbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701108553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dJQl4O9U/VvZTIC7iJqvzkMi5QnadT22i9SPyTvUprk=; b=dSPItqOEyvoJhWNfGYXyKdhAf4zxnxiNIiUsnavKZYxPOFSnX9XdB+7Obw16GXj/nOYw83 UEESfiHDBHopY4DcWy9mUMqJb5O7IjGSJtNaK5TZG3Bl6TuzxtXngAutee4AK6DqkaNnZD yYqsDiQbMl/nheNuF0sWppfF/Gd1mTk17gEFalpwzobMGefZLajXAXZPUrcGziembvfwik Du3p1R/3qTKdFLL6PmGMykojq6BVSalbj/AaYdAzm+uQwhbfjxPpfKz56n3cggE0hLKqfN LzDPSahsACt9RkjMOffseuo8PovAl8jKXV3VZgGdNk8ZGHbA6FpbYs0rP2xJTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701108553; a=rsa-sha256; cv=none; b=vv14Te7SfhPN4J+qSLs3MJM/pwXWabbMgmhQkOx8uW19r0kiDXxvHijOG7iPMCzIYxcKU1 vb/tm/vveCkK6+eV7uefy+CywWUAE2OgrP1WbZuHyDovICc7QxFavg6gX5M8E7lSuf0dLs gTZDCbbu68M8ApXHS9PaTBfMHN79/0EpYtHE4LL2fngeFkhMh9WKHnMn/tBa4yDokOcxkY iMaTzB8S4a6tz85nh4fj+EgxZs/oSybSIDSvoSQBnCRSmIXNn5knkMTjcZ041x+rg111Ds E0KbPBb9J0UfqG6ZGJmlrAQqY33LzAV/rAD6ANK8he6YJisiWO4rxXP3fzz5TQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfDB12LlKzp8B; Mon, 27 Nov 2023 18:09:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ARI9DX3068503; Mon, 27 Nov 2023 18:09:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARI9DRI068500; Mon, 27 Nov 2023 18:09:13 GMT (envelope-from git) Date: Mon, 27 Nov 2023 18:09:13 GMT Message-Id: <202311271809.3ARI9DRI068500@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 5ca0f1b40b47 - main - misc/py-pexpect: Update to 4.9.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ca0f1b40b479013a3140495fec2a2a99ff10fd2 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ca0f1b40b479013a3140495fec2a2a99ff10fd2 commit 5ca0f1b40b479013a3140495fec2a2a99ff10fd2 Author: Po-Chuan Hsieh AuthorDate: 2023-11-27 18:03:27 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-11-27 18:07:55 +0000 misc/py-pexpect: Update to 4.9.0 - Update WWW Changes: https://github.com/pexpect/pexpect/releases https://pexpect.readthedocs.io/en/stable/history.html --- misc/py-pexpect/Makefile | 6 +-- misc/py-pexpect/distinfo | 6 +-- misc/py-pexpect/files/patch-pexpect_bashrc.sh | 8 ---- .../files/patch-tests_PexpectTestCase.py | 11 ----- misc/py-pexpect/files/patch-tests_test__expect.py | 47 ---------------------- misc/py-pexpect/files/patch-tests_test__misc.py | 20 --------- .../files/patch-tests_test__popen__spawn.py | 20 --------- .../py-pexpect/files/patch-tests_test__replwrap.py | 11 ----- 8 files changed, 6 insertions(+), 123 deletions(-) diff --git a/misc/py-pexpect/Makefile b/misc/py-pexpect/Makefile index 02c033ac9c06..b10033256640 100644 --- a/misc/py-pexpect/Makefile +++ b/misc/py-pexpect/Makefile @@ -1,13 +1,13 @@ PORTNAME= pexpect -PORTVERSION= 4.8.0 -PORTREVISION= 1 +PORTVERSION= 4.9.0 CATEGORIES= misc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Python module for controlling interactive programs in pseudo-terminal -WWW= https://pexpect.readthedocs.io/ +WWW= https://pexpect.readthedocs.io/en/stable/ \ + https://github.com/pexpect/pexpect LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE diff --git a/misc/py-pexpect/distinfo b/misc/py-pexpect/distinfo index ab8ee0ef377a..7e358d25e052 100644 --- a/misc/py-pexpect/distinfo +++ b/misc/py-pexpect/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1579684146 -SHA256 (pexpect-4.8.0.tar.gz) = fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c -SIZE (pexpect-4.8.0.tar.gz) = 157037 +TIMESTAMP = 1701083398 +SHA256 (pexpect-4.9.0.tar.gz) = ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f +SIZE (pexpect-4.9.0.tar.gz) = 166450 diff --git a/misc/py-pexpect/files/patch-pexpect_bashrc.sh b/misc/py-pexpect/files/patch-pexpect_bashrc.sh deleted file mode 100644 index da3b2719271c..000000000000 --- a/misc/py-pexpect/files/patch-pexpect_bashrc.sh +++ /dev/null @@ -1,8 +0,0 @@ ---- pexpect/bashrc.sh.orig 2020-01-17 17:08:15 UTC -+++ pexpect/bashrc.sh -@@ -14,3 +14,5 @@ PS1="$" - - # Unset PROMPT_COMMAND, so that it can't change PS1 to something unexpected. - unset PROMPT_COMMAND -+ -+bind 'set enable-bracketed-paste off' diff --git a/misc/py-pexpect/files/patch-tests_PexpectTestCase.py b/misc/py-pexpect/files/patch-tests_PexpectTestCase.py deleted file mode 100644 index 4f71643ec7f1..000000000000 --- a/misc/py-pexpect/files/patch-tests_PexpectTestCase.py +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/PexpectTestCase.py.orig 2020-01-17 17:08:15 UTC -+++ tests/PexpectTestCase.py -@@ -97,7 +97,7 @@ class PexpectTestCase(unittest.TestCase): - raise AssertionError("%s was not raised" % excClass) - - @contextlib.contextmanager -- def assertRaisesRegexp(self, excClass, pattern): -+ def assertRaisesRegex(self, excClass, pattern): - import re - try: - yield diff --git a/misc/py-pexpect/files/patch-tests_test__expect.py b/misc/py-pexpect/files/patch-tests_test__expect.py deleted file mode 100644 index 5d068493d7e9..000000000000 --- a/misc/py-pexpect/files/patch-tests_test__expect.py +++ /dev/null @@ -1,47 +0,0 @@ ---- tests/test_expect.py.orig 2021-09-22 12:21:58 UTC -+++ tests/test_expect.py -@@ -411,7 +411,7 @@ class ExpectTestCase (PexpectTestCase.PexpectTestCase): - def test_before_across_chunks(self): - # https://github.com/pexpect/pexpect/issues/478 - child = pexpect.spawn( -- '''/bin/bash -c "openssl rand -base64 {} 2>/dev/null | head -500 | nl --number-format=rz --number-width=5 2>&1 ; echo 'PATTERN!!!'"'''.format(1024 * 1024 * 2), -+ '''/bin/sh -c "openssl rand -base64 {} 2>/dev/null | head -500 | nl -n rz -w 5 2>&1 ; echo 'PATTERN!!!'"'''.format(1024 * 1024 * 2), - searchwindowsize=128 - ) - child.expect(['PATTERN']) -@@ -456,7 +456,7 @@ class ExpectTestCase (PexpectTestCase.PexpectTestCase): - child = pexpect.spawn('cat', echo=False) - child.sendline('BEGIN') - for i in range(100): -- child.sendline('foo' * 100) -+ child.sendline('foo' * 10) - e = child.expect([b'xyzzy', pexpect.TIMEOUT], - searchwindowsize=10, timeout=0.001) - self.assertEqual(e, 1) -@@ -473,7 +473,7 @@ class ExpectTestCase (PexpectTestCase.PexpectTestCase): - child = pexpect.spawn('cat', echo=False) - child.sendline('BEGIN') - for i in range(100): -- child.sendline('foo' * 100) -+ child.sendline('foo' * 10) - e = child.expect([b'xyzzy', pexpect.TIMEOUT], - searchwindowsize=10, timeout=0.5) - self.assertEqual(e, 1) -@@ -569,13 +569,13 @@ class ExpectTestCase (PexpectTestCase.PexpectTestCase) - - def test_bad_arg(self): - p = pexpect.spawn('cat') -- with self.assertRaisesRegexp(TypeError, '.*must be one of'): -+ with self.assertRaisesRegex(TypeError, '.*must be one of'): - p.expect(1) -- with self.assertRaisesRegexp(TypeError, '.*must be one of'): -+ with self.assertRaisesRegex(TypeError, '.*must be one of'): - p.expect([1, b'2']) -- with self.assertRaisesRegexp(TypeError, '.*must be one of'): -+ with self.assertRaisesRegex(TypeError, '.*must be one of'): - p.expect_exact(1) -- with self.assertRaisesRegexp(TypeError, '.*must be one of'): -+ with self.assertRaisesRegex(TypeError, '.*must be one of'): - p.expect_exact([1, b'2']) - - def test_timeout_none(self): diff --git a/misc/py-pexpect/files/patch-tests_test__misc.py b/misc/py-pexpect/files/patch-tests_test__misc.py deleted file mode 100644 index 668854c6b5de..000000000000 --- a/misc/py-pexpect/files/patch-tests_test__misc.py +++ /dev/null @@ -1,20 +0,0 @@ ---- tests/test_misc.py.orig 2020-01-17 17:08:15 UTC -+++ tests/test_misc.py -@@ -214,7 +214,7 @@ class TestCaseMisc(PexpectTestCase.PexpectTestCase): - # Force an invalid state to test isalive - child.ptyproc.terminated = 0 - try: -- with self.assertRaisesRegexp(pexpect.ExceptionPexpect, -+ with self.assertRaisesRegex(pexpect.ExceptionPexpect, - ".*" + expect_errmsg): - child.isalive() - finally: -@@ -224,7 +224,7 @@ class TestCaseMisc(PexpectTestCase.PexpectTestCase): - def test_bad_arguments_suggest_fdpsawn(self): - " assert custom exception for spawn(int). " - expect_errmsg = "maybe you want to use fdpexpect.fdspawn" -- with self.assertRaisesRegexp(pexpect.ExceptionPexpect, -+ with self.assertRaisesRegex(pexpect.ExceptionPexpect, - ".*" + expect_errmsg): - pexpect.spawn(1) - diff --git a/misc/py-pexpect/files/patch-tests_test__popen__spawn.py b/misc/py-pexpect/files/patch-tests_test__popen__spawn.py deleted file mode 100644 index e95c4f38abf9..000000000000 --- a/misc/py-pexpect/files/patch-tests_test__popen__spawn.py +++ /dev/null @@ -1,20 +0,0 @@ ---- tests/test_popen_spawn.py.orig 2020-01-17 17:08:15 UTC -+++ tests/test_popen_spawn.py -@@ -110,13 +110,13 @@ class ExpectTestCase (PexpectTestCase.PexpectTestCase) - - def test_bad_arg(self): - p = PopenSpawn('cat') -- with self.assertRaisesRegexp(TypeError, '.*must be one of'): -+ with self.assertRaisesRegex(TypeError, '.*must be one of'): - p.expect(1) -- with self.assertRaisesRegexp(TypeError, '.*must be one of'): -+ with self.assertRaisesRegex(TypeError, '.*must be one of'): - p.expect([1, b'2']) -- with self.assertRaisesRegexp(TypeError, '.*must be one of'): -+ with self.assertRaisesRegex(TypeError, '.*must be one of'): - p.expect_exact(1) -- with self.assertRaisesRegexp(TypeError, '.*must be one of'): -+ with self.assertRaisesRegex(TypeError, '.*must be one of'): - p.expect_exact([1, b'2']) - - def test_timeout_none(self): diff --git a/misc/py-pexpect/files/patch-tests_test__replwrap.py b/misc/py-pexpect/files/patch-tests_test__replwrap.py deleted file mode 100644 index 7f98316ee132..000000000000 --- a/misc/py-pexpect/files/patch-tests_test__replwrap.py +++ /dev/null @@ -1,11 +0,0 @@ ---- tests/test_replwrap.py.orig 2021-09-22 14:15:55 UTC -+++ tests/test_replwrap.py -@@ -24,7 +24,7 @@ class REPLWrapTestCase(unittest.TestCase): - - def test_bash(self): - bash = replwrap.bash() -- res = bash.run_command("alias") -+ res = bash.run_command("alias xyzzy=true; alias") - assert 'alias' in res, res - - try: