gentoo resync : 12.05.2022

6 files changed, 2 insertions, 125 deletions

diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index f4d1bcc845f0..4ab3fbbcd5fe 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,8 +1,3 @@
-AUX parso-0.7.1-flaky-test.patch 1307 BLAKE2B 63af3a1a0f0d31aba82de3bf9e00001257a794e8e4da752a780d44be83421ca28600c400d9f1ad4bb491c0ed94bdcf61e430880d7305378246be2a16db8ba4f7 SHA512 2101a4cc01e90cc4ce37aa1386bea2be8334834bbe0ee54540bf5645e11ebcaf8395dd8b1fdd308cc1a124ec4f1fe623f7fdd35abc3b82aaf3d9c120becdc961
-AUX parso-0.8.2-flaky-test.patch 947 BLAKE2B b6ece3214328f3121e4de8217395ac108678a37a97bea943e900e13cf44fdbeccf70f2b3bf8dda70df6cf06feb73a55f2bd2d75236898e4cf45c8b22f46b93fb SHA512 b7c5ac93d2f44a897b8d9eb59c470c82b2013f4e3ebf35e81254294f9961e8916a6d590d61ed1d8f3841e50c47cc7902e13d1e28826869afa9168e44e85a98e0
-DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
 DIST parso-0.8.3.tar.gz 397648 BLAKE2B 8942408e27198075c92ef51f7a191cc7781eb3a5110119b91fd95f86e13ebe2fbfee11022a2bfec794150f60b3af8c4d5f324cb011703cd581c17f92232ae5bf SHA512 7874460053662d40c2cfcf0015e330e1c8201eeb07682e2079a636db553a82dc25b70b14ad0f0c82fb817f655359d695101a17f616abf9a39f49c61ae5fd49b1
-EBUILD parso-0.7.1-r1.ebuild 968 BLAKE2B 2477e3999525e9de62274bb1792cf441f2a7a338681e4fd999663347d54737946c6443a2f5978dbe45fec129b11e5438b294d29d7bacfe341e4cb214d9227337 SHA512 b106824ea5aaca2347acaf3ef22a0aedc64b1f914d0009b986951f8a29463d1230bd284f431de9b4bfa38a4d395bbd9960f3ac0fd0b0b45513942c98139dc672
-EBUILD parso-0.8.3-r1.ebuild 752 BLAKE2B 3de68b48da19a18168ec6ccb5641fb2be704b56ad7a7987d9a23971471d0cca166e83b55471c317044c345ca34ae723cf99d78aac53cd7fd42854a36ef189dd3 SHA512 f2f874a6360e419891a18abc081ed832c15f3831a5323fc636076e8f46f57862a973d18749e3bad94e21f68ed655001cf01c150a6522607540fd65fe7097e0c2
-EBUILD parso-0.8.3.ebuild 702 BLAKE2B ff951fe8ebe1d369872198111261cebfd1fd14c770528b72b0c62a4d448efaae418369ea1b4df4f80a695f1a3f9ad834d9ad2d8f9148cb09f2a54bd5e7d8bdec SHA512 62e54c6d14c5e7ab2561ead4d477eee0c0d168b46dacefe115f43bab8f101c9e6a8f4e8120b5ff95bb1405195f6ac916e5cea6ad9b61992ad5f7611afe31a289
+EBUILD parso-0.8.3-r1.ebuild 744 BLAKE2B add679c46648e975eebd80588b2aa1febfde010a1e3d0869067dfd9e0ee000fec82536957b1c7fc27ef91588393ed00c1c86404158cc03bdfc1392fec6bdb8dd SHA512 ab3158e82db730dfcbe01e726a12e7796e031b1a6eaebb664a1021d37230bdd04b608c43425ff0e8044881792dc589a135f4302ac2e94b64028b7dea62a3c537
 MISC metadata.xml 403 BLAKE2B be2e4f9dd7e074a3b76a591f034f679bff13b7dc36d8b206e45550276533ba752a8e04162ddf4f580a8e247d57f48a997cac34c14dc7b5ae4a3d74751fb9cac4 SHA512 10517311994816074cfcc4809206ccbdb6a9ac3430e92cf9c4dfc45d8e95a92843843e2bf1a19b97aaa3c330bb923581e4ea6cf6a88f1063f2dab8d041f6c90f
diff --git a/dev-python/parso/files/parso-0.7.1-flaky-test.patch b/dev-python/parso/files/parso-0.7.1-flaky-test.patch
deleted file mode 100644
index 609918f31bb5..000000000000
--- a/dev-python/parso/files/parso-0.7.1-flaky-test.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2799a7a3c2cf87fdc2d0c19a0890acea425091ce Mon Sep 17 00:00:00 2001
-From: Ivan Babrou <github@ivan.computer>
-Date: Tue, 23 Feb 2021 22:27:05 -0800
-Subject: [PATCH] Fix flaky test_cache_last_used_update
-
-Sometimes time moves slowly and strict comparison is not enough:
-
-```
->       assert now < node_cache_item.last_used < time.time()
-E       assert 1614147958.869299 < 1614147958.869299
-E        +  where 1614147958.869299 = <parso.cache._NodeCacheItem object at 0x10456fe80>.last_used
-E        +  and   1614147958.869299 = <built-in function time>()
-E        +    where <built-in function time> = time.time
-
-test/test_cache.py:149: AssertionError
-```
-
-In particular, macOS timings can be a bit coarse.
-
-The test failure is from Apple Silicon M1.
----
- test/test_cache.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_cache.py b/test/test_cache.py
-index bfdbaf5..f4291c2 100644
---- a/test/test_cache.py
-+++ b/test/test_cache.py
-@@ -146,7 +146,7 @@ def test_cache_last_used_update(diff_cache, use_file_io):
-         parse('somecode2', cache=True, path=p, diff_cache=diff_cache)
- 
-     node_cache_item = next(iter(parser_cache.values()))[p]
--    assert now < node_cache_item.last_used < time.time()
-+    assert now <= node_cache_item.last_used <= time.time()
- 
- 
- @skip_pypy
diff --git a/dev-python/parso/files/parso-0.8.2-flaky-test.patch b/dev-python/parso/files/parso-0.8.2-flaky-test.patch
deleted file mode 100644
index 729ec409c829..000000000000
--- a/dev-python/parso/files/parso-0.8.2-flaky-test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 60fed7b9f80cbb3d9cb7a9e42ad8c0f3c513801d Mon Sep 17 00:00:00 2001
-From: Saiyang Gou <gousaiyang@163.com>
-Date: Sat, 29 May 2021 18:17:24 -0700
-Subject: [PATCH] Fix flaky test_cache_last_used_update again (#189)
-
-This is a follow up for #177. On Windows, `assert node_cache_item.last_used < now` may fail as the two time values can be equal.
----
- test/test_cache.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/test_cache.py b/test/test_cache.py
-index f4291c2..5e633fc 100644
---- a/test/test_cache.py
-+++ b/test/test_cache.py
-@@ -137,7 +137,7 @@ def test_cache_last_used_update(diff_cache, use_file_io):
-     parse('somecode', cache=True, path=p)
-     node_cache_item = next(iter(parser_cache.values()))[p]
-     now = time.time()
--    assert node_cache_item.last_used < now
-+    assert node_cache_item.last_used <= now
- 
-     if use_file_io:
-         f = _FixedTimeFileIO(p, 'code', node_cache_item.last_used - 10)
diff --git a/dev-python/parso/parso-0.7.1-r1.ebuild b/dev-python/parso/parso-0.7.1-r1.ebuild
deleted file mode 100644
index 61ffc2a3595c..000000000000
--- a/dev-python/parso/parso-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}-flaky-test.patch
-	"${FILESDIR}"/${PN}-0.8.2-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
-		test/test_python_errors.py::test_default_except_error_postition
-	)
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/parso/parso-0.8.3-r1.ebuild b/dev-python/parso/parso-0.8.3-r1.ebuild
index e2527b1ee829..7aae84fd1c6c 100644
--- a/dev-python/parso/parso-0.8.3-r1.ebuild
+++ b/dev-python/parso/parso-0.8.3-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/parso/parso-0.8.3.ebuild b/dev-python/parso/parso-0.8.3.ebuild
deleted file mode 100644
index 1ed4f8130271..000000000000
--- a/dev-python/parso/parso-0.8.3.ebuild
+++ /dev/null
@@ -1,24 +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
-
-EPYTEST_DESELECT=(
-	# py3.10 changed exception messages
-	test/test_python_errors.py::test_python_exception_matches
-)