From cfabcaaf1f7436f0078b0ba48a97839ae2e499a3 Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@Home/mbp)" Date: Fri, 29 Apr 2022 16:51:46 +0200 Subject: [PATCH] update debugpy-1.6.0 --- README.md | 8 +- dev-python/debugpy/Manifest | 4 + dev-python/debugpy/debugpy-1.6.0.ebuild | 30 +++++++ .../files/debugpy-1.4.2-unbundle-pydevd.patch | 78 +++++++++++++++++++ dev-python/debugpy/metadata.xml | 15 ++++ 5 files changed, 131 insertions(+), 4 deletions(-) create mode 100644 dev-python/debugpy/Manifest create mode 100644 dev-python/debugpy/debugpy-1.6.0.ebuild create mode 100644 dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch create mode 100644 dev-python/debugpy/metadata.xml diff --git a/README.md b/README.md index d75d02007..05f0e51a1 100644 --- a/README.md +++ b/README.md @@ -506,11 +506,11 @@ A daily compile test is run at Github with Python 3.9 to catch general faults. E ## Licenses This repository itself is released under GPL-3 (like most Gentoo repositories), all work on the depending components under the licenses they came from. Perhaps you came here because I filed an issue at your component about a bad or missing license. It is easy to [assign a license](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository). During cleanups and license investigations I have been asked often which license to choose. I am not a lawyer, but I can offer the following table, counted over this repository, perhaps this helps your decision. If a package has more than one license listed, all of them are counted. -There are 1695 Ebuilds in total, 1688 of them have in total 1693 (35 different) licenses assigned. +There are 1696 Ebuilds in total, 1689 of them have in total 1694 (35 different) licenses assigned. |License| Ebuilds using it| |-------|-----| -|MIT|1039| +|MIT|1040| |Apache-2.0|298| |GPL-3|105| |BSD|90| @@ -546,9 +546,9 @@ There are 1695 Ebuilds in total, 1688 of them have in total 1693 (35 different) |CC-BY-NC-SA-4.0|1| |CC0-1.0|1| -(Last counted: 28/04/2022) +(Last counted: 29/04/2022) I did my best to keep these clean. If a valid license was published on PyPI, it has been automatically merged. Otherwise I took it from GitHub or alternatively from comments/files in the source. Sometimes these differed and have been not unique. All license strings are adjusted to the list in `/usr/portage/gentoo/licenses/`. Some packages do not have any license published. In this case, Authors have been asked for clarification, some did not respond. Following the [official Gentoo Guide](https://devmanual.gentoo.org/general-concepts/licenses/index.html), these then were added with an `all-rights-reserved` license and `RESTRICT="mirror"` was set. Find the appropriate licenses referenced in the Ebuild files and in the corresponding homepages or sources. A big thanks goes to Iris for reviewing this README. -Last updated: 28/04/2022 +Last updated: 29/04/2022 diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest new file mode 100644 index 000000000..3051efe1f --- /dev/null +++ b/dev-python/debugpy/Manifest @@ -0,0 +1,4 @@ +AUX debugpy-1.4.2-unbundle-pydevd.patch 2452 BLAKE2B 44cebbf0b1bd07c1abb5d8ea6489ff241ddd3bab28e8697462466c1d70160a2d7a2a7f51bcb1747fb8129854b16adb8eda7d7598741fe0c72ea6f8217878e569 SHA512 ee7b5a6125e071fe414e481633224a3e77a5f8d0cbf3fcd855932db3154f4371a92058ecb730b8f69c97a4f01601425eaa271aeb04cda5f2ac5c867c90001b95 +DIST debugpy-1.6.0.gh.tar.gz 6366079 BLAKE2B 134d2adcae6ec926dcdb7161f0874b830a1d0e3c55abb991f4861fa5a58045437ee4f4cb4c9572b902e3e33634bc3f9970ae055985b983d89d0ef1d99561bda8 SHA512 fe245d4ff751a6c2ef0e75a5249f99661b78075ac62c931c20e3ccbc9389d39a08dc2fda44a33eb23a0a76e5ee339edae439b0004d130cdfe421048f3cc83962 +EBUILD debugpy-1.6.0.ebuild 934 BLAKE2B 1f56b42dcbd2ea006333c8b454bd816616181c150179873e670ca629d853a07aec932044957ba26032de195b39b849317b639b8777e95005c97c81c3ebaf1d28 SHA512 d120f4a468c565f9653bd11588441116995c855c2d57a235ef6971bb4d6e91755a627a9a76b17c6e589fe84f7d039e9442d049348d8a70ec13f73d391297133a +MISC metadata.xml 463 BLAKE2B 04f9e41cc690266603da2c2df0be30ab1c41f9a3a52d53338ce1bff6e76505da864169e4ecd0787ef8328bee7dc8d2520a067bc9830328e0419c2489120fc3b7 SHA512 099b521a32608c288dd7d70f9d4e7a06126ff5d9dbe9965c85b504f54c0d6276800ad6d0c3e189b465968116e3ba3c9998f6f771290c806d7255786c114395cb diff --git a/dev-python/debugpy/debugpy-1.6.0.ebuild b/dev-python/debugpy/debugpy-1.6.0.ebuild new file mode 100644 index 000000000..5f6fd5514 --- /dev/null +++ b/dev-python/debugpy/debugpy-1.6.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +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 ~m68k ppc ppc64 ~riscv ~s390 sparc x86" + +# There is not enough time in the universe for this test suite +RESTRICT="test" + +RDEPEND="" +BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )" + +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 + distutils-r1_python_prepare_all +} diff --git a/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch new file mode 100644 index 000000000..7047877ef --- /dev/null +++ b/dev-python/debugpy/files/debugpy-1.4.2-unbundle-pydevd.patch @@ -0,0 +1,78 @@ +diff --git a/setup.py b/setup.py +index ee5bbba..f69dc95 100644 +--- a/setup.py ++++ b/setup.py +@@ -21,12 +21,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__)) + + +@@ -36,27 +34,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_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. +@@ -121,8 +98,6 @@ with open("DESCRIPTION.md", "r") as fh: + + + if __name__ == "__main__": +- if not os.getenv("SKIP_CYTHON_BUILD"): +- cython_build() + + extras = {} + platforms = get_buildplatform() +@@ -165,11 +140,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, +diff --git a/src/debugpy/server/__init__.py b/src/debugpy/server/__init__.py +index e6a1ad6..a79a86b 100644 +--- a/src/debugpy/server/__init__.py ++++ b/src/debugpy/server/__init__.py +@@ -3,7 +3,3 @@ + # for license information. + + from __future__ import absolute_import, division, print_function, unicode_literals +- +-# "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/dev-python/debugpy/metadata.xml b/dev-python/debugpy/metadata.xml new file mode 100644 index 000000000..c9c02e9b6 --- /dev/null +++ b/dev-python/debugpy/metadata.xml @@ -0,0 +1,15 @@ + + + + + b@edevau.net + Andreas Billmeier + + + debugpy + + ptvshelp@microsoft.com + Microsoft Corporation + + +