From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C43C15802F for ; Sat, 11 Mar 2023 10:02:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6EC79E07AE; Sat, 11 Mar 2023 10:02:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3ED7CE07AE for ; Sat, 11 Mar 2023 10:02:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4238E340E18 for ; Sat, 11 Mar 2023 10:02:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4F0D8DE for ; Sat, 11 Mar 2023 10:02:26 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1678528813.86dba8272365f6c1e74b3aea7239600c6afc747d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/debugpy/, dev-python/debugpy/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/debugpy/Manifest dev-python/debugpy/debugpy-1.6.3.ebuild dev-python/debugpy/files/debugpy-1.6.1-unbundle-pydevd.patch X-VCS-Directories: dev-python/debugpy/ dev-python/debugpy/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 86dba8272365f6c1e74b3aea7239600c6afc747d X-VCS-Branch: master Date: Sat, 11 Mar 2023 10:02:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0fca5cb7-2b72-4d0e-9b2b-66009ecde092 X-Archives-Hash: a6c76f5d62a0786793bab2adfcf00a8e commit: 86dba8272365f6c1e74b3aea7239600c6afc747d Author: Michał Górny gentoo org> AuthorDate: Sat Mar 11 10:00:13 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Mar 11 10:00:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86dba827 dev-python/debugpy: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/debugpy/Manifest | 1 - dev-python/debugpy/debugpy-1.6.3.ebuild | 43 ---------- .../files/debugpy-1.6.1-unbundle-pydevd.patch | 94 ---------------------- 3 files changed, 138 deletions(-) diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest index 23c020c4fa83..b5ce88b5c535 100644 --- a/dev-python/debugpy/Manifest +++ b/dev-python/debugpy/Manifest @@ -1,2 +1 @@ -DIST debugpy-1.6.3.gh.tar.gz 6697583 BLAKE2B 38138be3294615e78995575c8f8ad1f990733be90cfaf76197c714e84f179086501417cc2d64627d3a8ecd0fa451e14e3229bd14d02353bc7512e288e8d4f092 SHA512 c055351351f6705b7bbab93ec07abba09027f1f2a52d90a242f51b4eb6fec19821fbb251b8c8e80587d1333faa4c6d7cab5dead938e9739c5c45013af8ee46a7 DIST debugpy-1.6.6.gh.tar.gz 6942488 BLAKE2B 18c6eee2322239e5cbbacf9431fa7480abcf14a68f290d2228edc8b2ead042e7b09d19ee5bcc60be32e8a6b0b34b925eaa8246991298744f3ca74d4ed2ea3f3e SHA512 1a209bfd702d5f0649ce50b0910023e295953dd39cefdefb0b5af1d6023e629a727610789cd244e656bdf4276cee957fa463506ddaca603ab3ee85cc250dc212 diff --git a/dev-python/debugpy/debugpy-1.6.3.ebuild b/dev-python/debugpy/debugpy-1.6.3.ebuild deleted file mode 100644 index 9f7bbc8501a4..000000000000 --- a/dev-python/debugpy/debugpy-1.6.3.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.1-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/files/debugpy-1.6.1-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.6.1-unbundle-pydevd.patch deleted file mode 100644 index c8ebe384349d..000000000000 --- a/dev-python/debugpy/files/debugpy-1.6.1-unbundle-pydevd.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -8,7 +8,6 @@ exclude = ''' - ( __pycache__ - | ^/.tox - | ^/versioneer.py --| ^/src/debugpy/_vendored - | ^/src/debugpy/_version.py - ) - ''' ---- 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__)) - - -@@ -33,27 +31,6 @@ def get_buildplatform(): - return None - - --def cython_build(): -- print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)") -- subprocess.call( -- [ -- sys.executable, -- os.path.join(PYDEVD_ROOT, "setup_pydevd_cython.py"), -- "build_ext", -- "-i", -- ] -- ) -- -- --def iter_vendored_files(): -- # Add pydevd files as data files for this package. They are not -- # treated as a package of their own, because we don't actually -- # want to provide pydevd - just use our own copy internally. -- for project in debugpy._vendored.list_all(): -- for filename in debugpy._vendored.iter_packaging_files(project): -- yield filename -- -- - # bdist_wheel determines whether the package is pure or not based on ext_modules. - # However, all pydevd native modules are prebuilt and packaged as data, so they - # should not be in the list. -@@ -133,8 +110,6 @@ with open("DESCRIPTION.md", "r") as fh: - - - if __name__ == "__main__": -- if not os.getenv("SKIP_CYTHON_BUILD"): -- cython_build() - - extras = {} - platforms = get_buildplatform() -@@ -179,11 +154,9 @@ if __name__ == "__main__": - "debugpy.common", - "debugpy.launcher", - "debugpy.server", -- "debugpy._vendored", - ], - package_data={ - "debugpy": ["ThirdPartyNotices.txt"], -- "debugpy._vendored": list(iter_vendored_files()), - }, - ext_modules=ExtModules(), - has_ext_modules=lambda: True, ---- 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 ---- 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", - )