[gentoo-commits] repo/gentoo:master commit in: dev-python/parso/files/, dev-python/parso/

[Michał Górny]

commit:     a2ffa718ce7cd0747b8d2e7b2f1c91f919136540
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  1 01:15:37 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan  1 01:29:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2ffa718

dev-python/parso: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/parso/Manifest                        |  1 -
 dev-python/parso/files/parso-0.8.2-py310-2.patch | 57 ------------------------
 dev-python/parso/files/parso-0.8.2-py310.patch   | 29 ------------
 dev-python/parso/parso-0.8.2.ebuild              | 34 --------------
 4 files changed, 121 deletions(-)

diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 1ff516e0eddc..91bdb40e9e69 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,3 +1,2 @@
 DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
-DIST parso-0.8.2.tar.gz 394419 BLAKE2B f4e86ae55140adc9bbfdd34a8044e7fdfbf9d318a6385ac5feedc07127061943c2d690581af144f158846e3bf6f82124046c7e625369a4055ab92a54f9210c49 SHA512 a90810ad89301d804d215392ed77593b015f13bc7ef8512302a8893b314a9e74c15e2aaa77157c8595a134d3481e8115f306f9628835271478837ec6f19e645f
 DIST parso-0.8.3.tar.gz 397648 BLAKE2B 8942408e27198075c92ef51f7a191cc7781eb3a5110119b91fd95f86e13ebe2fbfee11022a2bfec794150f60b3af8c4d5f324cb011703cd581c17f92232ae5bf SHA512 7874460053662d40c2cfcf0015e330e1c8201eeb07682e2079a636db553a82dc25b70b14ad0f0c82fb817f655359d695101a17f616abf9a39f49c61ae5fd49b1

diff --git a/dev-python/parso/files/parso-0.8.2-py310-2.patch b/dev-python/parso/files/parso-0.8.2-py310-2.patch
deleted file mode 100644
index 7c6b1ad78286..000000000000
--- a/dev-python/parso/files/parso-0.8.2-py310-2.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From dc41958947770849c8b3b4d344db434e2c8548cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
-Date: Thu, 5 Aug 2021 09:09:28 +0200
-Subject: [PATCH] Update expected exception line numbers for Python 3.10.0rc1
-
-It seems that upstream has fixed line numbers in some of the expections
-in Python 3.10.0rc1, so update the tests accordingly.  This means that
-test_non_async_in_async() gets the correct line again,
-and test_default_except_error_postition() no longer suffers from
-the apparent off-by-one problem.
-
-This doesn't fix tests entirely with Python 3.10 but it's a step
-forward.
----
- test/test_python_errors.py | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/test/test_python_errors.py b/test/test_python_errors.py
-index cda9bd2..e847ebb 100644
---- a/test/test_python_errors.py
-+++ b/test/test_python_errors.py
-@@ -57,10 +57,10 @@ def test_non_async_in_async():
-         error, = errors
-         actual = error.message
-     assert actual in wanted
--    if sys.version_info[:2] < (3, 8):
-+    if sys.version_info[:2] not in ((3, 8), (3,9)):
-         assert line_nr == error.start_pos[0]
-     else:
--        assert line_nr == 0  # For whatever reason this is zero in Python 3.8+
-+        assert line_nr == 0  # For whatever reason this is zero in Python 3.8/3.9
- 
- 
- @pytest.mark.parametrize(
-@@ -140,13 +140,16 @@ def _get_actual_exception(code):
- 
- 
- def test_default_except_error_postition():
--    # For this error the position seemed to be one line off, but that doesn't
--    # really matter.
-+    # For this error the position seemed to be one line off in Python < 3.10,
-+    # but that doesn't really matter.
-     code = 'try: pass\nexcept: pass\nexcept X: pass'
-     wanted, line_nr = _get_actual_exception(code)
-     error, = _get_error_list(code)
-     assert error.message in wanted
--    assert line_nr != error.start_pos[0]
-+    if sys.version_info[:2] >= (3, 10):
-+        assert line_nr == error.start_pos[0]
-+    else:
-+        assert line_nr != error.start_pos[0]
-     # I think this is the better position.
-     assert error.start_pos[0] == 2
- 
--- 
-2.32.0
-

diff --git a/dev-python/parso/files/parso-0.8.2-py310.patch b/dev-python/parso/files/parso-0.8.2-py310.patch
deleted file mode 100644
index 2f3487dd2f61..000000000000
--- a/dev-python/parso/files/parso-0.8.2-py310.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cbb61fb81955a8cdbb5cdeedc9bcfffa39a5f270 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@×××××××.cz>
-Date: Thu, 22 Apr 2021 21:04:49 +0200
-Subject: [PATCH] Relax a test regex to match new enum repr in Python 3.10.0a7+
- (#186)
-
-bpo-40066: Enum: adjust repr() to show only enum and member name (not value,
-nor angle brackets) and str() to show only member name.
-https://bugs.python.org/issue40066
----
- test/test_pgen2.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_pgen2.py b/test/test_pgen2.py
-index 9b0dd34..85ccacf 100644
---- a/test/test_pgen2.py
-+++ b/test/test_pgen2.py
-@@ -339,7 +339,7 @@ def test_left_recursion():
- @pytest.mark.parametrize(
-     'grammar, error_match', [
-         ['foo: bar | baz\nbar: NAME\nbaz: NAME\n',
--         r"foo is ambiguous.*given a PythonTokenTypes\.NAME.*bar or baz"],
-+         r"foo is ambiguous.*given a (PythonTokenTypes\.)?NAME.*bar or baz"],
-         ['''foo: bar | baz\nbar: 'x'\nbaz: "x"\n''',
-          r"foo is ambiguous.*given a ReservedString\(x\).*bar or baz"],
-         ['''foo: bar | 'x'\nbar: 'x'\n''',
--- 
-2.32.0
-

diff --git a/dev-python/parso/parso-0.8.2.ebuild b/dev-python/parso/parso-0.8.2.ebuild
deleted file mode 100644
index 0d7b47040d48..000000000000
--- a/dev-python/parso/parso-0.8.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
-HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
-SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-	"${FILESDIR}"/${P}-py310-2.patch
-	"${FILESDIR}"/${P}-flaky-test.patch
-)
-
-python_test() {
-	local deselect=()
-	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
-		# py3.10 changed exception messages
-		test/test_python_errors.py::test_python_exception_matches
-	)
-	epytest ${deselect[@]/#/--deselect }
-}