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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59295158042 for ; Sat, 26 Oct 2024 05:41:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 987D0E09C2; Sat, 26 Oct 2024 05:41:47 +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 7FA28E09C2 for ; Sat, 26 Oct 2024 05:41:47 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A24CB343100 for ; Sat, 26 Oct 2024 05:41:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 150CAAE7 for ; Sat, 26 Oct 2024 05:41:45 +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: <1729920926.75b02e6e6eefb956c29554ae4dce3cde42f51069.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/ftfy/files/, dev-python/ftfy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/ftfy/Manifest dev-python/ftfy/files/ftfy-6.2.0-poetry.patch dev-python/ftfy/ftfy-6.2.0.ebuild dev-python/ftfy/ftfy-6.2.3.ebuild X-VCS-Directories: dev-python/ftfy/files/ dev-python/ftfy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 75b02e6e6eefb956c29554ae4dce3cde42f51069 X-VCS-Branch: master Date: Sat, 26 Oct 2024 05:41:45 +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: 200642e5-cda3-47d1-9072-aec347f70741 X-Archives-Hash: 7825e92a07c2bd4ab56e96d60a260d83 commit: 75b02e6e6eefb956c29554ae4dce3cde42f51069 Author: Michał Górny gentoo org> AuthorDate: Sat Oct 26 05:35:26 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Oct 26 05:35:26 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b02e6e dev-python/ftfy: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/ftfy/Manifest | 2 -- dev-python/ftfy/files/ftfy-6.2.0-poetry.patch | 36 ------------------------- dev-python/ftfy/ftfy-6.2.0.ebuild | 39 --------------------------- dev-python/ftfy/ftfy-6.2.3.ebuild | 27 ------------------- 4 files changed, 104 deletions(-) diff --git a/dev-python/ftfy/Manifest b/dev-python/ftfy/Manifest index cf5ab4284fed..c6da2d32f4b6 100644 --- a/dev-python/ftfy/Manifest +++ b/dev-python/ftfy/Manifest @@ -1,3 +1 @@ -DIST ftfy-6.2.0.tar.gz 63675 BLAKE2B 4d2455c004737b2914edcdf22dc53e433f1f9d9a1b469f8b34069ce7a4b04c30a5b2a0d76db35d8e1f9ba0469cdff604271e7331f9fca0d8b579cc61c422cde1 SHA512 31724b3f65936a146f567a493988b3a3ce5ba87ac7578b97a64f0946cc20d09fcab040964cec9bcf3fbac1f79cad0b67c5e74aaa871a7d6c856f5939e7a30529 -DIST ftfy-6.2.3.tar.gz 64165 BLAKE2B 83fdd2ba0b8b321b2cbac62c4e41a68356cc8a73970c0683aca8915624b622d1ef462c4724afd1dbcae494387aad3b97ba836cc47d433fb10b57a5c1019ee602 SHA512 6711dbe9750db6bc25c57d5d600d1db52eff6f22caa7ff89c06615bbd7dd612cca56f9e9a35c633648747c421f2e710a6e24ee1f9a6d6df0ac6f6049a5189e8e DIST ftfy-6.3.0.tar.gz 362118 BLAKE2B 30dd2a94a155203827bd43f05371f5a8ac3fb880a621f1d6323cfd0570310f326ef3d97dac3f82bc683dfd9a7b2eb3c7d056b3dbd9ef94a950046cb2a2c567b1 SHA512 1fd1c209961a69a4424f3b0f51f599d7b1a86035470cb3a0ceef998f0b7a7dc80d709b2d2efa122beac16819a46799255dbb6bce58949c28c3d919c20431c865 diff --git a/dev-python/ftfy/files/ftfy-6.2.0-poetry.patch b/dev-python/ftfy/files/ftfy-6.2.0-poetry.patch deleted file mode 100644 index 1766a9aa98b9..000000000000 --- a/dev-python/ftfy/files/ftfy-6.2.0-poetry.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4ef6eeef8764086816034992705d4a4ebba4e88c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Wed, 3 Apr 2024 10:33:02 +0200 -Subject: [PATCH] fix pyproject.toml not to install stray files into - site-packages - -Fix the `include` directives in `pyproject.toml` to include the relevant -files in `sdist` archives only and not in wheels, where they end up -being installed straight into site-packages, e.g. as: - - /usr/lib/python3.12/site-packages/CHANGELOG.md - /usr/lib/python3.12/site-packages/README.md ---- - pyproject.toml | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index fc3e6b9..3bc68e2 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -4,7 +4,11 @@ version = "6.2.0" - description = "Fixes mojibake and other problems with Unicode, after the fact" - authors = ["Robyn Speer "] - license = "Apache-2.0" --include = ["README.md", "CHANGELOG.md", "tests"] -+include = [ -+ {path = "README.md", format = "sdist"}, -+ {path = "CHANGELOG.md", format = "sdist"}, -+ {path = "tests", format = "sdist"}, -+] - readme = "README.md" - - [tool.poetry.dependencies] --- -2.44.0 - diff --git a/dev-python/ftfy/ftfy-6.2.0.ebuild b/dev-python/ftfy/ftfy-6.2.0.ebuild deleted file mode 100644 index 91e9718f0575..000000000000 --- a/dev-python/ftfy/ftfy-6.2.0.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( pypy3 python3_{10..13} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Fixes mojibake and other problems with Unicode, after the fact" -HOMEPAGE=" - https://ftfy.readthedocs.io/en/latest/ - https://github.com/rspeer/python-ftfy/ - https://pypi.org/project/ftfy/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - =dev-python/wcwidth-0.2.12[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - # https://github.com/rspeer/python-ftfy/pull/204 - "${FILESDIR}/${P}-poetry.patch" - ) - - # https://github.com/rspeer/python-ftfy/pull/205 - sed -i -e "s:'poetry', 'run',::" tests/test_cli.py || die - - distutils-r1_src_prepare -} diff --git a/dev-python/ftfy/ftfy-6.2.3.ebuild b/dev-python/ftfy/ftfy-6.2.3.ebuild deleted file mode 100644 index fe56cdad539d..000000000000 --- a/dev-python/ftfy/ftfy-6.2.3.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( pypy3 python3_{10..13} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Fixes mojibake and other problems with Unicode, after the fact" -HOMEPAGE=" - https://ftfy.readthedocs.io/en/latest/ - https://github.com/rspeer/python-ftfy/ - https://pypi.org/project/ftfy/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - =dev-python/wcwidth-0.2.12[${PYTHON_USEDEP}] -" - -distutils_enable_tests pytest