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 B8AF215800F for ; Fri, 17 Feb 2023 06:27:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A088E0857; Fri, 17 Feb 2023 06:27:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id E2E0DE0857 for ; Fri, 17 Feb 2023 06:27:40 +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 2B113340F47 for ; Fri, 17 Feb 2023 06:27:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7ECB8A9 for ; Fri, 17 Feb 2023 06:27:38 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1676614936.485262e28f2aae4d6718cdbd8717841a1a0aa038.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyusb/files/, dev-python/pyusb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pyusb/files/pyusb-1.2.1-setuptools.patch dev-python/pyusb/pyusb-1.2.1.ebuild X-VCS-Directories: dev-python/pyusb/ dev-python/pyusb/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 485262e28f2aae4d6718cdbd8717841a1a0aa038 X-VCS-Branch: master Date: Fri, 17 Feb 2023 06:27:38 +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: 0cf1b7dc-ca1f-4337-a37d-2d9cb73e5cee X-Archives-Hash: 3e577da1b810de27b71f166b9b398d29 commit: 485262e28f2aae4d6718cdbd8717841a1a0aa038 Author: Sam James gentoo org> AuthorDate: Fri Feb 17 06:04:18 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 17 06:22:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=485262e2 dev-python/pyusb: enable py3.11, use pypi.eclass, fix w/ newer setuptools Signed-off-by: Sam James gentoo.org> .../pyusb/files/pyusb-1.2.1-setuptools.patch | 37 ++++++++++++++++++++++ dev-python/pyusb/pyusb-1.2.1.ebuild | 9 ++++-- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dev-python/pyusb/files/pyusb-1.2.1-setuptools.patch b/dev-python/pyusb/files/pyusb-1.2.1-setuptools.patch new file mode 100644 index 000000000000..26b5e204d648 --- /dev/null +++ b/dev-python/pyusb/files/pyusb-1.2.1-setuptools.patch @@ -0,0 +1,37 @@ +https://github.com/pyusb/pyusb/commit/777dea9d718e70d7323c821d4497c706b35742da + +From 777dea9d718e70d7323c821d4497c706b35742da Mon Sep 17 00:00:00 2001 +From: Jonas Malaco +Date: Tue, 12 Jul 2022 03:12:50 -0300 +Subject: [PATCH] version: handle when patch component is missing + +actions/checkout@v3 (by default) no longer fetches the tags while +checking out the repository. This, combined with our use of +setuptools_scm post-release scheme, results in tox trying to run the +tests with version strings that look something like + + pyusb-0.0.post1+g3678fc1.zip + +and breaking _get_extended_version_info(). + +Make _get_extended_version_info() robust against this case. This is +preferable to configuring actions/checkout@v3 to fetch the tags as, +being related shallow clones, it might also happen in other contexts. + +Fixes: 678fc1867f4 ("github: update to actions/checkout@v3") +--- a/usb/__init__.py ++++ b/usb/__init__.py +@@ -55,9 +55,9 @@ + + def _get_extended_version_info(version): + import re +- m = re.match(r'(\d+)\.(\d+)\.(\d+)[.-]?(.*)', version) +- major, minor, patch, suffix = m.groups() +- return int(major), int(minor), int(patch), suffix ++ m = re.match(r'(\d+)\.(\d+)(\.(\d+))?[.-]?(.*)', version) ++ major, minor, _, patch, suffix = m.groups() ++ return int(major), int(minor), int(patch or "0"), suffix + + extended_version_info = _get_extended_version_info(__version__) + version_info = extended_version_info[:3] + diff --git a/dev-python/pyusb/pyusb-1.2.1.ebuild b/dev-python/pyusb/pyusb-1.2.1.ebuild index 900eb0c4252d..d7c303722986 100644 --- a/dev-python/pyusb/pyusb-1.2.1.ebuild +++ b/dev-python/pyusb/pyusb-1.2.1.ebuild @@ -3,12 +3,11 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) -inherit distutils-r1 +PYTHON_COMPAT=( python3_{9..11} ) +inherit distutils-r1 pypi DESCRIPTION="USB support for Python" HOMEPAGE="https://pyusb.github.io/pyusb/ https://pypi.org/project/pyusb/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" @@ -20,6 +19,10 @@ RDEPEND="${DEPEND}" DOCS=( README.rst docs/tutorial.rst ) +PATCHES=( + "${FILESDIR}"/${P}-setuptools.patch +) + python_test() { cd tests || die "${EPYTHON}" testall.py || die "Tests failed with ${EPYTHON}"