commit: 471594b7f0a246ff2a6673175cc7625f2ae2a7c5 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Mar 29 14:32:46 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Mar 29 14:32:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=471594b7
dev-python/debugpy: Remove last-rited pkg Closes: https://bugs.gentoo.org/924221 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/debugpy/Manifest | 2 - 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 ----- profiles/package.mask | 6 -- profiles/prefix/darwin/macos/package.mask | 1 - 8 files changed, 270 deletions(-) diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest deleted file mode 100644 index c4d06f27e148..000000000000 --- a/dev-python/debugpy/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -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 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 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Science Project</name> - </maintainer> - <upstream> - <remote-id type="pypi">debugpy</remote-id> - <remote-id type="github">microsoft/debugpy</remote-id> - <maintainer status="unknown"> - <email>[email protected]</email> - <name>Microsoft Corporation</name> - </maintainer> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 2347e7a7358b..6a8507d844f1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -814,12 +814,6 @@ dev-util/build2 # Removal on 2024-03-15. dev-java/icedtea -# Michał Górny <[email protected]> (2024-02-10) -# Very fragile, keeps breaking. Limited platform support. Used only -# as an optional dependency for dev-python/ipykernel. -# Removal on 2024-03-11. Bug #924221. -dev-python/debugpy - # Ulrich Müller <[email protected]> (2024-02-08) # Masked for testing. # Test failure in watchpoints.dem, undefined function FresnelC. diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask index ef91c267508f..929018114296 100644 --- a/profiles/prefix/darwin/macos/package.mask +++ b/profiles/prefix/darwin/macos/package.mask @@ -7,7 +7,6 @@ # "_main", referenced from: # implicit entry/start for main executable dev-python/pydevd -dev-python/debugpy # Benda Xu <[email protected]> (2023-08-18) # strlcpy and other BSD functions are available in the libc of macOS.
