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 D374215800F for ; Fri, 13 Jan 2023 17:13:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA590E086C; Fri, 13 Jan 2023 17:13:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9149DE086C for ; Fri, 13 Jan 2023 17:13:05 +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 ADAF3340C08 for ; Fri, 13 Jan 2023 17:13:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19799836 for ; Fri, 13 Jan 2023 17:13:03 +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: <1673629890.8fa7eee8542b3dbc5a363f90dbf43b3a1bac2bb1.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/ipdb/, dev-python/ipdb/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/ipdb/Manifest dev-python/ipdb/files/ipdb-0.13.9-tomli.patch dev-python/ipdb/ipdb-0.13.9-r3.ebuild X-VCS-Directories: dev-python/ipdb/ dev-python/ipdb/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8fa7eee8542b3dbc5a363f90dbf43b3a1bac2bb1 X-VCS-Branch: master Date: Fri, 13 Jan 2023 17:13:03 +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: e38b6267-8397-4d69-9289-e1bbaaf1e587 X-Archives-Hash: eaa3904fbd160540ee6b082682b116db commit: 8fa7eee8542b3dbc5a363f90dbf43b3a1bac2bb1 Author: Michał Górny gentoo org> AuthorDate: Fri Jan 13 17:11:30 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jan 13 17:11:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fa7eee8 dev-python/ipdb: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/ipdb/Manifest | 1 - dev-python/ipdb/files/ipdb-0.13.9-tomli.patch | 54 --------------------------- dev-python/ipdb/ipdb-0.13.9-r3.ebuild | 41 -------------------- 3 files changed, 96 deletions(-) diff --git a/dev-python/ipdb/Manifest b/dev-python/ipdb/Manifest index 987bd05d5ca3..6af4113bdafd 100644 --- a/dev-python/ipdb/Manifest +++ b/dev-python/ipdb/Manifest @@ -1,2 +1 @@ DIST ipdb-0.13.11.tar.gz 16770 BLAKE2B 849bb91f9fd2d0443f7696aee5e2b1de87a284b410189a471be91175e792132e816abcace865b788454d59ddbf5bc443c98e6308d0453b7a7a81a580c3afd24e SHA512 c44e012db71aa543742f16bd737e1e18db3f060b65c8fa0eaa6ce7567f99f44b5aa09bfb44457c6e4d6fb1fac8d822ece580bc4036adbd612f4d50a82f0eba21 -DIST ipdb-0.13.9.tar.gz 16820 BLAKE2B d028fff2c4273fd4a57c3338093f0065868856b4f7b2b95aa0db3c2b1e7c5906fc17b5b55b79b3a3809465214bd91ac1891cefc1604ed866edaa2811380175f6 SHA512 da0ac6d8a7451e90cf433ab2a0d4e43fff76be03082da5cf31b83fdc56174fde7f0256009ad9a407d805c0bf12da5fa2f081e1aa0e0ce73ca648262acd385671 diff --git a/dev-python/ipdb/files/ipdb-0.13.9-tomli.patch b/dev-python/ipdb/files/ipdb-0.13.9-tomli.patch deleted file mode 100644 index 20eecdd8721c..000000000000 --- a/dev-python/ipdb/files/ipdb-0.13.9-tomli.patch +++ /dev/null @@ -1,54 +0,0 @@ -From bc06e22817f2644c6ecc838f60c93fbedb9e0016 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Wed, 12 Oct 2022 16:57:24 +0200 -Subject: [PATCH] Support tomllib/tomli in newer Python versions - -Support the built-in `tomllib` module from Python 3.11 and the modern -TOML processing library `tomli` in newer versions of Python 3. The old -`toml` package is unmaintained and does not implement TOML 1.0 -correctly. ---- - ipdb/__main__.py | 14 ++++++++++++-- - setup.py | 4 ++-- - 2 files changed, 14 insertions(+), 4 deletions(-) - -diff --git a/ipdb/__main__.py b/ipdb/__main__.py -index ea2ae88..2c3f675 100644 ---- a/ipdb/__main__.py -+++ b/ipdb/__main__.py -@@ -176,8 +176,18 @@ def get_config(): - read_func(f) - # To use on pyproject.toml, put [tool.ipdb] section - elif filepath.endswith('pyproject.toml'): -- import toml -- toml_file = toml.load(filepath) -+ try: -+ if sys.version_info >= (3, 11): -+ import tomllib -+ else: -+ import tomli as tomllib -+ -+ with open(filepath, "rb") as f: -+ toml_file = tomllib.load(f) -+ except ImportError: -+ import toml -+ toml_file = toml.load(filepath) -+ - if "tool" in toml_file and "ipdb" in toml_file["tool"]: - if not parser.has_section("ipdb"): - parser.add_section("ipdb") -diff --git a/setup.py b/setup.py -index 6ce51c0..04f594c 100644 ---- a/setup.py -+++ b/setup.py -@@ -64,8 +64,8 @@ - # FTR, `decorator` is also a dependency of Ipython. - ':python_version == "3.4"': ['ipython >= 6.0.0, < 7.0.0', 'toml >= 0.10.2', 'decorator < 5.0.0'], - ':python_version == "3.5"': ['ipython >= 7.0.0, < 7.10.0', 'toml >= 0.10.2', 'decorator'], -- ':python_version == "3.6"': ['ipython >= 7.10.0, < 7.17.0', 'toml >= 0.10.2', 'decorator'], -- ':python_version > "3.6"': ['ipython >= 7.17.0', 'toml >= 0.10.2', 'decorator'], -+ ':python_version == "3.6"': ['ipython >= 7.10.0, < 7.17.0', 'tomli', 'decorator'], -+ ':python_version > "3.6"': ['ipython >= 7.17.0', 'tomli', 'decorator'], - }, - tests_require=[ - 'mock; python_version<"3"' diff --git a/dev-python/ipdb/ipdb-0.13.9-r3.ebuild b/dev-python/ipdb/ipdb-0.13.9-r3.ebuild deleted file mode 100644 index d180cac0d023..000000000000 --- a/dev-python/ipdb/ipdb-0.13.9-r3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 optfeature - -DESCRIPTION="IPython-enabled pdb" -HOMEPAGE=" - https://github.com/gotcha/ipdb/ - https://pypi.org/project/ipdb/ -" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86" - -RDEPEND=" - >=dev-python/ipython-7.17[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/tomli[${PYTHON_USEDEP}] - ) -" - -DOCS=( AUTHORS HISTORY.txt README.rst ) - -PATCHES=( - "${FILESDIR}"/${P}-tomli.patch -) - -distutils_enable_tests unittest - -pkg_postinst() { - optfeature "pyproject.toml support" dev-python/tomli -}