dev-python/ipdb: Remove old

Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
2023-01-13 18:11:30 +01:00
parent 359141da7d
commit 8fa7eee854
3 changed files with 0 additions and 96 deletions

View File

@@ -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

View File

@@ -1,54 +0,0 @@
From bc06e22817f2644c6ecc838f60c93fbedb9e0016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
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"'

View File

@@ -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
}