gentoo auto-resync : 21:10:2023 - 03:55:38

10 files changed, 119 insertions, 49 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3bbb59b48fcc..6bd5d97a4c8b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index 2e6c6e66f59e..547b0f21d619 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -1,4 +1,7 @@
 AUX debugpy-1.6.6-unbundle-pydevd.patch 2531 BLAKE2B c7cf5cc10a75393b191ab3ecd3137b2d4df30a0611b76fd18bf1822aa61c06ec912358afe6da420c1ace3314e12b57079cadb0deebeb19fc3242f75f7ef5860a SHA512 98d6557c516617273a1a75c5269733f02d55754078ba9a5137f9abdcddc58275a7ea451f290ecf809003abc614b0865d235a8b712caec71e3811911a4f231448
+AUX debugpy-1.8.0-unbundle-pydevd.patch 1480 BLAKE2B 6694cbb68e8e5793f22fedc9351875810c86c1add4299bbb5360dedc24bcbdbb0128163cc11dab3effc611dbe5ef43ea45e9504914f6c55f4f66b76b9da0b804 SHA512 553ce357019e561e50770bf747adc33ac037cf5aa9fc08c44ce9c1cb87ecba28b7c632adb5b743c38067c1bb6b97f1d239ad8dee404332bc8028be44afd018ce
 DIST debugpy-1.6.6.gh.tar.gz 6942488 BLAKE2B 18c6eee2322239e5cbbacf9431fa7480abcf14a68f290d2228edc8b2ead042e7b09d19ee5bcc60be32e8a6b0b34b925eaa8246991298744f3ca74d4ed2ea3f3e SHA512 1a209bfd702d5f0649ce50b0910023e295953dd39cefdefb0b5af1d6023e629a727610789cd244e656bdf4276cee957fa463506ddaca603ab3ee85cc250dc212
+DIST debugpy-1.8.0.gh.tar.gz 6760323 BLAKE2B 99c4188c0b0383dc4dcbdd86c4d35e6eb973ca32ba56b757adea9668b161f20f17b436e0dc019790b1e85586387fc848712143c5e3d3814e2522850d97a4048e SHA512 f9e47371ca854c12811d1c0984f063b1ad5cac2bea769f91a67f9fa125cfcbeccbecafca9b9d5ea16a4ed8a1c123f34db3ba19efe1567b93a86cbd325239b355
 EBUILD debugpy-1.6.6.ebuild 1145 BLAKE2B c9fab7600289a7c493412da331daf21d570536187d44ee0f9985a7007393413643e1a28f51e71f22430b58646140cc08aea05eaf227fd47cb22e50ba7affad07 SHA512 a80aea8f84167cfbc8a54dcb183f7ce71cba4e6ab288351223c83820aaa68a0f60d56f97cbe5499163712130ea3689d6bb8b0de3b009f829a5fc61be3c0e979c
+EBUILD debugpy-1.8.0.ebuild 1634 BLAKE2B 2b38e01e72a960547a281c348e64af40782ce55813254ab70dbf4aed418337c96b6ebaf2bbfba2456232fd3615bf6df9888d14e3034907dfb60a115f0058a069 SHA512 604709b07be073806affaf281024740959fad5939c08ab87690e8be6359b100ce1d9ae8267df8d3f4145b4ccd6f2fc76522e87b6a5ddf08ae136c817470936d4
 MISC metadata.xml 508 BLAKE2B f5af1472be02222c1eb89246c4c4b782aaf5de8dd785aa983bbee6df69982b96c276310480a7ffbf2ac0105268507474d3b0823fc9e0bff89acfe648a2cc490f SHA512 d4697748bc79f4c684dd3bf58e52b211e8ba7816041840e705b896f2731a1a0518a01d7b7cca5e441bbc88e6eb272175c26681517873883068c4fe1bc864c09b
diff --git a/dev-python/debugpy/debugpy-1.8.0.ebuild b/dev-python/debugpy/debugpy-1.8.0.ebuild
new file mode 100644
index 000000000000..bf665f0da2e0
--- /dev/null
+++ b/dev-python/debugpy/debugpy-1.8.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
+HOMEPAGE="
+	https://github.com/microsoft/debugpy/
+	https://pypi.org/project/debugpy/
+"
+SRC_URI="
+	https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pydevd[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Unbundle dev-python/pydevd
+	rm -r src/debugpy/_vendored/pydevd || die
+	local PATCHES=(
+		"${FILESDIR}/${PN}-1.8.0-unbundle-pydevd.patch"
+	)
+
+	# Drop unnecessary and unrecognized option
+	# __main__.py: error: unrecognized arguments: -n8
+	# Do not timeout
+	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_DESELECT=(
+		tests/debugpy/test_gevent.py::test_gevent
+		tests/debugpy/test_run.py::test_custom_python_args
+		tests/tests/test_timeline.py::test_occurrences
+	)
+	local EPYTEST_IGNORE=(
+		tests/tests/test_vendoring.py
+	)
+	epytest -p timeout -p xdist -n "$(makeopts_jobs)" --dist=worksteal \
+		-k "not attach_pid"
+}
diff --git a/dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch
new file mode 100644
index 000000000000..54ccdae4ca01
--- /dev/null
+++ b/dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch
@@ -0,0 +1,46 @@
+diff --git a/setup.py b/setup.py
+index 0bb4f00..abfce1c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -18,12 +18,10 @@ del sys.path[0]
+ 
+ sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
+ import debugpy
+-import debugpy._vendored
+ 
+ del sys.path[0]
+ 
+ 
+-PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
+ DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
+ 
+ 
+@@ -146,8 +144,6 @@ if __name__ == "__main__":
+         extras["platforms"] = platforms
+ 
+     cmds = versioneer.get_cmdclass()
+-    override_build(cmds)
+-    override_build_py(cmds)
+ 
+     setuptools.setup(
+         name="debugpy",
+diff --git a/src/debugpy/_vendored/force_pydevd.py b/src/debugpy/_vendored/force_pydevd.py
+index cfd8927..0cb1bca 100644
+--- a/src/debugpy/_vendored/force_pydevd.py
++++ b/src/debugpy/_vendored/force_pydevd.py
+@@ -8,15 +8,6 @@ import warnings
+ 
+ from . import check_modules, prefix_matcher, preimport, vendored
+ 
+-# Ensure that pydevd is our vendored copy.
+-_unvendored, _ = check_modules('pydevd',
+-                               prefix_matcher('pydev', '_pydev'))
+-if _unvendored:
+-    _unvendored = sorted(_unvendored.values())
+-    msg = 'incompatible copy of pydevd already imported'
+-    # raise ImportError(msg)
+-    warnings.warn(msg + ':\n {}'.format('\n  '.join(_unvendored)))
+-
+ # If debugpy logging is enabled, enable it for pydevd as well
+ if "DEBUGPY_LOG_DIR" in os.environ:
+     os.environ[str("PYDEVD_DEBUG")] = str("True")
diff --git a/dev-python/nh3/Manifest b/dev-python/nh3/Manifest
index f8d935d518d6..ee0f097fa17d 100644
--- a/dev-python/nh3/Manifest
+++ b/dev-python/nh3/Manifest
@@ -64,5 +64,5 @@ DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65
 DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602
 DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396
 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
-EBUILD nh3-0.2.14.ebuild 1964 BLAKE2B dc260777c09a8dacd35d07bddae0b4529e07f3ddfff528ebee03c8444a4d1a1f35306bbd441df079ebf0afeac2d01dbe8baad94b2ad8f96e775f0b46d03205dd SHA512 9e9027ab34dba1db3960b12f9d8732c7dcf8b9063996d00fbd99ad6ed13a5e0aaf76edb7595edb976c54d94447df20aba8a7e0364a37a12e7b40faf85f670d93
+EBUILD nh3-0.2.14.ebuild 1962 BLAKE2B 714f8511fb3b6859ff451795c740a355b29e145e4daa0ad5e38db7dc4de9b87ab1e7e28a6736cb8d2e5d095e0771cde3e5e616cb086b8993acb283de33e05023 SHA512 a27696bb5cbeae65fcbb544850b377a18405474cb2c20b00c98f12f7cc47224c8dfcba1e9b77c5169e8b928d170cd7dae90b4e8ef2faad83115948b05f1b8e85
 MISC metadata.xml 337 BLAKE2B d51bb8c0e03241a1f0db1d6491ee4d689a29fb53824e9536954fc7b0160ac9b481c8502b93f58aa56cb550ff4eb88ce0beb0b6ec7a4bfbb7bfd43e5e8fe071e4 SHA512 2aad73707aaa365a44321d6064536c2dff0528bac777fa0761ecc72845afd9eeb4e02cbad45607dcc17075077e5a29907381bd72c9c4b04aaf4eba387ea25811
diff --git a/dev-python/nh3/nh3-0.2.14.ebuild b/dev-python/nh3/nh3-0.2.14.ebuild
index 2eae307048a8..b60032d3f903 100644
--- a/dev-python/nh3/nh3-0.2.14.ebuild
+++ b/dev-python/nh3/nh3-0.2.14.ebuild
@@ -92,7 +92,7 @@ LICENSE+="
 	Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/readme-renderer/Manifest b/dev-python/readme-renderer/Manifest
index 812c6cd01d67..514945421041 100644
--- a/dev-python/readme-renderer/Manifest
+++ b/dev-python/readme-renderer/Manifest
@@ -3,5 +3,5 @@ DIST readme_renderer-41.0.tar.gz 32420 BLAKE2B 130585144f2344a3991abca2e62a8f2b4
 DIST readme_renderer-42.0.tar.gz 31532 BLAKE2B d20e6e27e3d551d25788f177671d54b9307ab78f6d685e77831e20bb36ebf4e5b1e0d5d0622ec8d2e868ee202aa1176fa09348137c88f90d2da462aa2c477de1 SHA512 76d78fb2d92faa581679691feeb3cec50ef518417c6c1f187527209ac995f549b4de4b38c7449d1e4dfa7b93d30bfd599db7d01e5e5228c00a24261b0421ce66
 EBUILD readme-renderer-40.0.ebuild 771 BLAKE2B 357cf11429217f89369e5d382c65b9a8fcd6f5670a67885a7c9ac848fd68a868cbf09d7dbc1fae9666512a28427cc17e9e053944d866f03c6935b6962f66912e SHA512 e347302424c6c5771a39f1946be4cc128c7f339f650a9fbc4f26982fa4963869b18c4ab80d47cb52e23b3af75fa28546f39c12147c8ad9dc75d332337d7fed33
 EBUILD readme-renderer-41.0.ebuild 778 BLAKE2B 43676a4154362ac5e5f0ca8091eab551c4e03d8815b20c663b7957f546c704ab098d84dd1533faf493fd50eae30ea91816c28b591f54f1dac85f62c866e5378c SHA512 078b26c2f242231c441b2cb04c73ff06d44870b05c0b56e5f8956ad0d4b0739a23570188dee466ab001cef1096b8005035d1b8fb3152b3b37e9425860482901b
-EBUILD readme-renderer-42.0.ebuild 747 BLAKE2B a4905ad84a8984e41d50ac00904645dd4526ab34abd86d68ccfddab8d48387056b08d9191bde1f4b92d7181eb5b6864f826ec026b5e9f1dc08a4504cfa8242fb SHA512 2cb190bdab7231f3c892641c0866607c4b1e110acb589f314c20f890bf761dd836451b3e9f2b6c8465760cb3ca0daf74b7615d710a16e04dfbea681e96d3c18f
+EBUILD readme-renderer-42.0.ebuild 745 BLAKE2B 20df2442b37ae84b82c72ca1fec798f66c7bf7f7c29ed6c4dee6b400f30d973b3fddfe4174486826f6f03481caa0b2e6eb050f275ea726f7a3a9051a37bbf63d SHA512 0a9f0bd5ddeaf9910aeef513f4bbd802bbc9f1b0e539976498ad1f99100d0fe7f7b452eb900c0a0264f942054489ad166180418a0cc266b57cd38577973f9e60
 MISC metadata.xml 416 BLAKE2B 1441314990a3eca464ea227d76e458a42b3c9bf44076f64a59d22cdddaace1fdbe219b3e6f8fb963cc40174aaf473852698facbc8816f55278821df0f452a1ed SHA512 50abec4287629f7982049959696e8f21e0a773618c40b42815d53e709d080ff6051235453a4659c50bd4cf856829d0489cdd0f4e1f56cc65f28d5de45d849b86
diff --git a/dev-python/readme-renderer/readme-renderer-42.0.ebuild b/dev-python/readme-renderer/readme-renderer-42.0.ebuild
index a465f528f9d0..17f196583b18 100644
--- a/dev-python/readme-renderer/readme-renderer-42.0.ebuild
+++ b/dev-python/readme-renderer/readme-renderer-42.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 3c9b75c645f7..8e09552958ce 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,5 +1,3 @@
-DIST s3transfer-0.6.2.tar.gz 132821 BLAKE2B 0441b1270adbddcabcff6a6a62128d753d6faa50f590bab4d41ebb2e89aa27c40e2036d8fd7ae59392838e79b0d8b740423cb9d585361e85433f62415978487b SHA512 2f52621fac81a9209f5d4bcfad0a861906e714d0159cb3776f5fbc1e9a4946072d4c4e969dfea2837c600ce1d0ba55c53c6c892b59950f0b910b29bdf9ab0cca
 DIST s3transfer-0.7.0.tar.gz 132904 BLAKE2B cdb1315d4c6ca2ae36199f3a7c0796a1460c07d9b3c68c47f94fea99082ba9136fd13904908e477af84fdeec1ee45e35993612734dd66e989e28706c80f893d4 SHA512 93a0ee7fe607796b7d78319897465e09bc1b0a8dd430b7f13997cbecb54922edb9db7eadbd663a9b65c66d10ef19bc6bd876c51f73349cf377ef02febccffdb0
-EBUILD s3transfer-0.6.2.ebuild 893 BLAKE2B f61eedd93ab02cdab2514db100a18cae6b9f2600d34ad4ae86328f03f9da79d5cd61d2a6af878340bfc0498f62f3462ad077f688f7cc97777dcc1c2b99a938e7 SHA512 8bb21bdf3fd5131ab2dfa4156f0cef20e61a9cc9060aea57a4ed96235b6b8f7f204fa3068159cbc49c8b92637e531473f16d9ab34e316a60b7848c17a7edd3ec
 EBUILD s3transfer-0.7.0.ebuild 893 BLAKE2B f61eedd93ab02cdab2514db100a18cae6b9f2600d34ad4ae86328f03f9da79d5cd61d2a6af878340bfc0498f62f3462ad077f688f7cc97777dcc1c2b99a938e7 SHA512 8bb21bdf3fd5131ab2dfa4156f0cef20e61a9cc9060aea57a4ed96235b6b8f7f204fa3068159cbc49c8b92637e531473f16d9ab34e316a60b7848c17a7edd3ec
 MISC metadata.xml 503 BLAKE2B 7b8bc8c7e251064ab7becbccff47ab889e54362d3350cf2b78529b60a95a2f52f39b42451c2a26af30ea8cd3fddd9c950c3b40d07d1c72bc6b0730817d7f4680 SHA512 25529c55cc73bca86f770a069f995e2f6f6494d436b52ae24e5b7e1523bf8f62bcfe5ad8e3f727456897a5f9c0ff9b8752ccaba4d3b65b62b5d70b9a3c4b0b43
diff --git a/dev-python/s3transfer/s3transfer-0.6.2.ebuild b/dev-python/s3transfer/s3transfer-0.6.2.ebuild
deleted file mode 100644
index eb471d88a484..000000000000
--- a/dev-python/s3transfer/s3transfer-0.6.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="
-	https://github.com/boto/s3transfer/
-	https://pypi.org/project/s3transfer/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/botocore-1.24.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest tests/{unit,functional}
-}