From f8088653780aa5da724adc26c408d9f697b3af94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 31 May 2025 11:25:27 +0200 Subject: [PATCH] dev-python/faker: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/faker/Manifest | 1 - dev-python/faker/faker-37.1.0.ebuild | 47 ------------------- .../faker/files/faker-37.1.0-py314.patch | 45 ------------------ 3 files changed, 93 deletions(-) delete mode 100644 dev-python/faker/faker-37.1.0.ebuild delete mode 100644 dev-python/faker/files/faker-37.1.0-py314.patch diff --git a/dev-python/faker/Manifest b/dev-python/faker/Manifest index 4b71250b14c9..4a2a9d969441 100644 --- a/dev-python/faker/Manifest +++ b/dev-python/faker/Manifest @@ -1,2 +1 @@ -DIST faker-37.1.0.tar.gz 1875707 BLAKE2B 67ae3cecd677fde963a6177ebd56f868487cb872d91e825cbef71c73ec227d0f7f6376e8580e587750cfab7fd35e823b67bf655ae883ef701caacf7c0424f16e SHA512 f7abea076457b8eaf391c600f5f91eed9ec11f48e8d0f48e43c4d3a318a8b40da492c23052d3bd6d84b7472a87459cab75c63872492544423f53aec4b596fbf7 DIST faker-37.3.0.tar.gz 1901376 BLAKE2B bb8506dc82848e26c1eb47e7e237de4c6aa6b9d0b40ff7f3ae7586d700067ac1ffd95f0a4fcb63544523a9f3e99a27ed173fd4c39016989ae9d1c1b1c5cc8fd3 SHA512 da0a2fdc6646a581802c47c6bcf66c4c1658d4b72d0b0972c13ac5c1c991d96204bd8efd73c6042dd4785614f115b99c6221e243f6ed86326ab69882c1470a5f diff --git a/dev-python/faker/faker-37.1.0.ebuild b/dev-python/faker/faker-37.1.0.ebuild deleted file mode 100644 index 57e328c855a3..000000000000 --- a/dev-python/faker/faker-37.1.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2022-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_PN=${PN^} -PYTHON_COMPAT=( pypy3_11 python3_{11..14} ) - -inherit distutils-r1 pypi - -DESCRIPTION="A Python package that generates fake data for you" -HOMEPAGE=" - https://github.com/joke2k/faker/ - https://pypi.org/project/Faker/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - dev-python/tzdata[${PYTHON_USEDEP}] - !dev-ruby/faker -" -BDEPEND=" - test? ( - dev-python/freezegun[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP},tiff] - dev-python/validators[${PYTHON_USEDEP}] - ) -" - -# note: tests are flaky with xdist -distutils_enable_tests pytest - -PATCHES=( - # https://github.com/joke2k/faker/pull/2213 - "${FILESDIR}/${P}-py314.patch" -) - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - local -x PYTEST_PLUGINS=faker.contrib.pytest.plugin - epytest - epytest --exclusive-faker-session tests/pytest/session_overrides -} diff --git a/dev-python/faker/files/faker-37.1.0-py314.patch b/dev-python/faker/files/faker-37.1.0-py314.patch deleted file mode 100644 index 9f6931ba7a8d..000000000000 --- a/dev-python/faker/files/faker-37.1.0-py314.patch +++ /dev/null @@ -1,45 +0,0 @@ -From eaad7bb42385793a0622376caf3b832a7836781e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Wed, 14 May 2025 13:17:48 +0200 -Subject: [PATCH] Fix type annotations for Python 3.14 - -Fix type annotations for `Provider.json()` to avoid name collision -in Python 3.14.0b1 where `json` is resolved to the `json()` method -itself rather than the `json` module. Import `JSONEncoder` directly -instead, so we can reference it without `json.`. - -Fixes #2212 ---- - faker/providers/misc/__init__.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/faker/providers/misc/__init__.py b/faker/providers/misc/__init__.py -index dca3363e..6ed2e958 100644 ---- a/faker/providers/misc/__init__.py -+++ b/faker/providers/misc/__init__.py -@@ -9,6 +9,7 @@ import tarfile - import uuid - import zipfile - -+from json import JSONEncoder - from typing import Any, Callable, Dict, List, Literal, Optional, Sequence, Set, Tuple, Type, Union, overload - - from faker.exceptions import UnsupportedFeature -@@ -536,7 +537,7 @@ class Provider(BaseProvider): - data_columns: Optional[List] = None, - num_rows: int = 10, - indent: Optional[int] = None, -- cls: Optional[Type[json.JSONEncoder]] = None, -+ cls: Optional[Type[JSONEncoder]] = None, - ) -> bytes: - """ - Generate random JSON structure and return as bytes. -@@ -551,7 +552,7 @@ class Provider(BaseProvider): - data_columns: Optional[List] = None, - num_rows: int = 10, - indent: Optional[int] = None, -- cls: Optional[Type[json.JSONEncoder]] = None, -+ cls: Optional[Type[JSONEncoder]] = None, - ) -> str: - """ - Generate random JSON structure values.