From 62090949b4fde34bbcbb4bd770a9635c6ac0c55e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 29 Mar 2024 19:13:18 +0000 Subject: gentoo auto-resync : 29:03:2024 - 19:13:18 --- dev-python/debugpy/Manifest | 7 -- dev-python/debugpy/debugpy-1.6.6.ebuild | 43 ------------ dev-python/debugpy/debugpy-1.8.0.ebuild | 79 ---------------------- .../files/debugpy-1.6.6-unbundle-pydevd.patch | 77 --------------------- .../files/debugpy-1.8.0-unbundle-pydevd.patch | 46 ------------- dev-python/debugpy/metadata.xml | 16 ----- 6 files changed, 268 deletions(-) delete mode 100644 dev-python/debugpy/Manifest delete mode 100644 dev-python/debugpy/debugpy-1.6.6.ebuild delete mode 100644 dev-python/debugpy/debugpy-1.8.0.ebuild delete mode 100644 dev-python/debugpy/files/debugpy-1.6.6-unbundle-pydevd.patch delete mode 100644 dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch delete mode 100644 dev-python/debugpy/metadata.xml (limited to 'dev-python/debugpy') diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest deleted file mode 100644 index 213a27af3796..000000000000 --- a/dev-python/debugpy/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -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 1978 BLAKE2B 6c9a21a7cf8b76aaa82efe3f7a9f367858458338e2b93cb1f85885e65f6d71f720272729b05431eb035dd0932e4b48d702dd98eea334de901c86b36961635d88 SHA512 84457bb3da5f1240e38aa341d72cdd024013120ee9990de08c4e4587ecc1a650c35c9a9b6d6992e4d6ab8d739f65240476f2d9e1cdaa07c03f4690d017c568d5 -MISC metadata.xml 508 BLAKE2B f5af1472be02222c1eb89246c4c4b782aaf5de8dd785aa983bbee6df69982b96c276310480a7ffbf2ac0105268507474d3b0823fc9e0bff89acfe648a2cc490f SHA512 d4697748bc79f4c684dd3bf58e52b211e8ba7816041840e705b896f2731a1a0518a01d7b7cca5e441bbc88e6eb272175c26681517873883068c4fe1bc864c09b diff --git a/dev-python/debugpy/debugpy-1.6.6.ebuild b/dev-python/debugpy/debugpy-1.6.6.ebuild deleted file mode 100644 index 1d59edda4b4d..000000000000 --- a/dev-python/debugpy/debugpy-1.6.6.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 - -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 - -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" - -# This is completely broken -RESTRICT="test" - -RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]" -BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/${PN}-1.6.6-unbundle-pydevd.patch" -) - -distutils_enable_tests pytest - -python_prepare_all() { - # 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 - - # Unbundle dev-python/pydevd - rm -r src/debugpy/_vendored tests/tests/test_vendoring.py || die - - distutils-r1_python_prepare_all -} diff --git a/dev-python/debugpy/debugpy-1.8.0.ebuild b/dev-python/debugpy/debugpy-1.8.0.ebuild deleted file mode 100644 index 71f66c164616..000000000000 --- a/dev-python/debugpy/debugpy-1.8.0.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 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 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 - # TODO: random regressions - tests/debugpy/test_flask.py::test_flask_breakpoint_multiproc - tests/debugpy/test_exception.py::test_raise_exception_options - tests/debugpy/test_exception.py::test_vsc_exception_options_raise_without_except - ) - local EPYTEST_IGNORE=( - tests/tests/test_vendoring.py - ) - - case ${EPYTHON} in - python3.12) - EPYTEST_DESELECT+=( - tests/debugpy/test_flask.py - ) - ;; - esac - - epytest -p timeout -p xdist -n "$(makeopts_jobs)" --dist=worksteal \ - -k "not attach_pid" -} diff --git a/dev-python/debugpy/files/debugpy-1.6.6-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.6.6-unbundle-pydevd.patch deleted file mode 100644 index d285775c9246..000000000000 --- a/dev-python/debugpy/files/debugpy-1.6.6-unbundle-pydevd.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 9a79e55..8725d19 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -8,7 +8,6 @@ exclude = ''' - ( __pycache__ - | ^/.tox - | ^/versioneer.py --| ^/src/debugpy/_vendored - | ^/src/debugpy/_version.py - ) - ''' -diff --git a/setup.py b/setup.py -index 3abc811..c11924c 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", -@@ -183,14 +179,9 @@ if __name__ == "__main__": - "debugpy.common", - "debugpy.launcher", - "debugpy.server", -- "debugpy._vendored", - ], - package_data={ - "debugpy": ["ThirdPartyNotices.txt"], -- "debugpy._vendored": [ -- # pydevd extensions must be built before this list can be computed properly, -- # so it is populated in the overridden build_py.finalize_options(). -- ], - }, - ext_modules=ExtModules(), - has_ext_modules=lambda: True, -diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py -index 42d5367..e333dcf 100644 ---- a/src/debugpy/server/__init__.py -+++ b/src/debugpy/server/__init__.py -@@ -1,7 +1,3 @@ - # Copyright (c) Microsoft Corporation. All rights reserved. - # Licensed under the MIT License. See LICENSE in the project root - # for license information. -- --# "force_pydevd" must be imported first to ensure (via side effects) --# that the debugpy-vendored copy of pydevd gets used. --import debugpy._vendored.force_pydevd # noqa -diff --git a/src/debugpy/server/attach_pid_injected.py b/src/debugpy/server/attach_pid_injected.py -index a8df6e1..a29a969 100644 ---- a/src/debugpy/server/attach_pid_injected.py -+++ b/src/debugpy/server/attach_pid_injected.py -@@ -31,7 +31,6 @@ def attach(setup): - pydevd_attach_to_process_path = os.path.join( - _debugpy_dir, - "debugpy", -- "_vendored", - "pydevd", - "pydevd_attach_to_process", - ) 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 deleted file mode 100644 index 54ccdae4ca01..000000000000 --- a/dev-python/debugpy/files/debugpy-1.8.0-unbundle-pydevd.patch +++ /dev/null @@ -1,46 +0,0 @@ -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/debugpy/metadata.xml b/dev-python/debugpy/metadata.xml deleted file mode 100644 index a6c53f2a9008..000000000000 --- a/dev-python/debugpy/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - sci@gentoo.org - Gentoo Science Project - - - debugpy - microsoft/debugpy - - ptvshelp@microsoft.com - Microsoft Corporation - - - -- cgit v1.2.3