mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-python/isort: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
@@ -1,4 +1 @@
|
||||
DIST isort-5.12.0.gh.tar.gz 743141 BLAKE2B a7f8deef02b57162eebe15b35e71382c654372a80dedba7eee63d0c9b0899c053fb517401585af17014db3cf9ed44089f6cbd1e2b0ed17393cc667de06bfbddd SHA512 ceb861d1a077be6fecd82fde775bded1fb676c77135e2004c92a6221762e0b3ff6c1071d17957e1add4062ec26ba6c9264e4905724f2c659339cbd0601f4b45e
|
||||
DIST isort-5.13.0.gh.tar.gz 753826 BLAKE2B 074e8b762b304618a2291d96dc9e18061e5303f3e6772479e8eda42c687cf289c12c73ce585c869df754b244bf14d59c6d2eba10877756287d88f27a3d470939 SHA512 3c5a170b1526ec58f1c774e4b55e2227df0af23eebd7a387d61cd3eaa0a698b5ad22a0be81a87d4e6a026030ffbdaea0f23331a43e28b5df98bf33b7afe2a42d
|
||||
DIST isort-5.13.1.gh.tar.gz 754890 BLAKE2B 53168670d38efa9fba549a32235c47781e200e7ee36289514acc19b127fa5a99d9d97305fbeff1afa9dd6f8f57385f0b01ce57b4bd0ee64e255bcfe144fadbbf SHA512 23a5f7579e327f109575454e5443ee039c207aa0b6f6ad35509cf514b45a7a3fcae116fd8ee40c96d717694cfd85bd7f431481b1a456b7390f914abec2460f42
|
||||
DIST isort-5.13.2.gh.tar.gz 755256 BLAKE2B 4cc8a0209ba954d93c030e6ad038933b50aa2f17b173762f598bc8038f36f72ecd1e7a3f6e73398bbfc99f464d14927f77044ca68126815023a8d456497985a1 SHA512 fe2bd27f0aa6219d44c3124782d400338a801a911d6a09ad51e7f80cbcbce250838350ad6cc80a35f641e0a319778ddcfb4dc61c8c76999ebc63a5147953e378
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
From abfb91fd7da34111828d81a20fe7aeaaab7a58c7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||
Date: Mon, 6 Nov 2023 13:29:21 +0100
|
||||
Subject: [PATCH] Fix assertions in `test_git_hook`
|
||||
|
||||
Fix `called_once()` assertions in `test_git_hook` to use the correct
|
||||
`assert_called_once()` method. The former does not exist, so it
|
||||
evaluates to a mocked method in Python < 3.12, making the assert
|
||||
meaningless, and it triggers an error in Python 3.12+.
|
||||
|
||||
While at it, split the mock into two because otherwise the test would
|
||||
fail because two `hooks.git_hook()` calls imply two mock calls.
|
||||
---
|
||||
tests/unit/test_hooks.py | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/unit/test_hooks.py b/tests/unit/test_hooks.py
|
||||
index 2757f414f..29685f503 100644
|
||||
--- a/tests/unit/test_hooks.py
|
||||
+++ b/tests/unit/test_hooks.py
|
||||
@@ -11,7 +11,7 @@ def test_git_hook(src_dir):
|
||||
# Ensure correct subprocess command is called
|
||||
with patch("subprocess.run", MagicMock()) as run_mock:
|
||||
hooks.git_hook()
|
||||
- assert run_mock.called_once()
|
||||
+ run_mock.assert_called_once()
|
||||
assert run_mock.call_args[0][0] == [
|
||||
"git",
|
||||
"diff-index",
|
||||
@@ -21,8 +21,9 @@ def test_git_hook(src_dir):
|
||||
"HEAD",
|
||||
]
|
||||
|
||||
+ with patch("subprocess.run", MagicMock()) as run_mock:
|
||||
hooks.git_hook(lazy=True)
|
||||
- assert run_mock.called_once()
|
||||
+ run_mock.assert_called_once()
|
||||
assert run_mock.call_args[0][0] == [
|
||||
"git",
|
||||
"diff-index",
|
||||
@@ -1,16 +0,0 @@
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index ae539490..11e229ad 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -41,11 +41,6 @@ include = [
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
python = ">=3.8.0"
|
||||
-pipreqs = {version = "*", optional = true}
|
||||
-requirementslib = {version = "*", optional = true}
|
||||
-pip-api = {version = "*", optional = true}
|
||||
-colorama = {version = ">=0.4.6", optional = true}
|
||||
-setuptools = {version = "*", optional = true}
|
||||
|
||||
[tool.poetry.extras]
|
||||
colors = ["colorama"]
|
||||
@@ -1,79 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=poetry
|
||||
PYTHON_COMPAT=( python3_{10..12} pypy3 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="A python utility/library to sort imports"
|
||||
HOMEPAGE="
|
||||
https://github.com/PyCQA/isort/
|
||||
https://pypi.org/project/isort/
|
||||
"
|
||||
SRC_URI="
|
||||
https://github.com/PyCQA/isort/archive/${PV}.tar.gz
|
||||
-> ${P}.gh.tar.gz
|
||||
"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/tomli[${PYTHON_USEDEP}]
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-python/black[${PYTHON_USEDEP}]
|
||||
dev-python/colorama[${PYTHON_USEDEP}]
|
||||
dev-python/hypothesis[${PYTHON_USEDEP}]
|
||||
dev-python/natsort[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-mock[${PYTHON_USEDEP}]
|
||||
dev-vcs/git
|
||||
)
|
||||
"
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
src_prepare() {
|
||||
local PATCHES=(
|
||||
# https://github.com/PyCQA/isort/pull/2196
|
||||
"${FILESDIR}/${P}-py312.patch"
|
||||
)
|
||||
|
||||
# unbundle tomli
|
||||
sed -i -e 's:from ._vendored ::' isort/settings.py || die
|
||||
rm -r isort/_vendored || die
|
||||
|
||||
distutils-r1_src_prepare
|
||||
}
|
||||
|
||||
python_test() {
|
||||
cp -a "${BUILD_DIR}"/{install,test} || die
|
||||
local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
|
||||
|
||||
# Install necessary plugins
|
||||
local p
|
||||
for p in example*/; do
|
||||
pushd "${p}" >/dev/null || die
|
||||
distutils_pep517_install "${BUILD_DIR}"/test
|
||||
popd >/dev/null || die
|
||||
done
|
||||
|
||||
local EPYTEST_IGNORE=(
|
||||
# Excluded from upstream's test script
|
||||
tests/unit/test_deprecated_finders.py
|
||||
)
|
||||
|
||||
if ! has_version "dev-python/pylama[${PYTHON_USEDEP}]"; then
|
||||
EPYTEST_IGNORE+=(
|
||||
tests/unit/test_importable.py
|
||||
tests/unit/test_pylama_isort.py
|
||||
)
|
||||
fi
|
||||
|
||||
epytest tests/unit
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=poetry
|
||||
PYTHON_COMPAT=( python3_{10..12} pypy3 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="A python utility/library to sort imports"
|
||||
HOMEPAGE="
|
||||
https://github.com/PyCQA/isort/
|
||||
https://pypi.org/project/isort/
|
||||
"
|
||||
SRC_URI="
|
||||
https://github.com/PyCQA/isort/archive/${PV}.tar.gz
|
||||
-> ${P}.gh.tar.gz
|
||||
"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
|
||||
RDEPEND="
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/tomli[${PYTHON_USEDEP}]
|
||||
' 3.10)
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-python/black[${PYTHON_USEDEP}]
|
||||
>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
|
||||
dev-python/hypothesis[${PYTHON_USEDEP}]
|
||||
dev-python/natsort[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-mock[${PYTHON_USEDEP}]
|
||||
dev-vcs/git
|
||||
)
|
||||
"
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
src_prepare() {
|
||||
local PATCHES=(
|
||||
# sigh, can't people just stop using poetry?!
|
||||
# https://github.com/PyCQA/isort/commit/f7a6b0eea57e87155a367e2490b49b40f83c3944
|
||||
"${FILESDIR}/${P}-poetry.patch"
|
||||
)
|
||||
|
||||
# unbundle tomli
|
||||
sed -i -e 's:from ._vendored ::' isort/settings.py || die
|
||||
rm -r isort/_vendored || die
|
||||
|
||||
distutils-r1_src_prepare
|
||||
}
|
||||
|
||||
python_test() {
|
||||
cp -a "${BUILD_DIR}"/{install,test} || die
|
||||
local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
|
||||
|
||||
# Install necessary plugins
|
||||
local p
|
||||
for p in example*/; do
|
||||
pushd "${p}" >/dev/null || die
|
||||
distutils_pep517_install "${BUILD_DIR}"/test
|
||||
popd >/dev/null || die
|
||||
done
|
||||
|
||||
local EPYTEST_IGNORE=(
|
||||
# Excluded from upstream's test script
|
||||
tests/unit/test_deprecated_finders.py
|
||||
)
|
||||
|
||||
if ! has_version "dev-python/pylama[${PYTHON_USEDEP}]"; then
|
||||
EPYTEST_IGNORE+=(
|
||||
tests/unit/test_importable.py
|
||||
tests/unit/test_pylama_isort.py
|
||||
)
|
||||
fi
|
||||
|
||||
epytest tests/unit
|
||||
}
|
||||
@@ -1,76 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=poetry
|
||||
PYTHON_COMPAT=( python3_{10..12} pypy3 )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="A python utility/library to sort imports"
|
||||
HOMEPAGE="
|
||||
https://github.com/PyCQA/isort/
|
||||
https://pypi.org/project/isort/
|
||||
"
|
||||
SRC_URI="
|
||||
https://github.com/PyCQA/isort/archive/${PV}.tar.gz
|
||||
-> ${P}.gh.tar.gz
|
||||
"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
|
||||
RDEPEND="
|
||||
$(python_gen_cond_dep '
|
||||
dev-python/tomli[${PYTHON_USEDEP}]
|
||||
' 3.10)
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-python/black[${PYTHON_USEDEP}]
|
||||
>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
|
||||
dev-python/hypothesis[${PYTHON_USEDEP}]
|
||||
dev-python/natsort[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-mock[${PYTHON_USEDEP}]
|
||||
dev-vcs/git
|
||||
)
|
||||
"
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
src_prepare() {
|
||||
# unbundle tomli
|
||||
sed -i -e 's:from ._vendored ::' isort/settings.py || die
|
||||
rm -r isort/_vendored || die
|
||||
|
||||
distutils-r1_src_prepare
|
||||
}
|
||||
|
||||
python_test() {
|
||||
cp -a "${BUILD_DIR}"/{install,test} || die
|
||||
local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
|
||||
|
||||
# Install necessary plugins
|
||||
local p
|
||||
for p in example*/; do
|
||||
pushd "${p}" >/dev/null || die
|
||||
distutils_pep517_install "${BUILD_DIR}"/test
|
||||
popd >/dev/null || die
|
||||
done
|
||||
|
||||
local EPYTEST_IGNORE=(
|
||||
# Excluded from upstream's test script
|
||||
tests/unit/test_deprecated_finders.py
|
||||
)
|
||||
|
||||
if ! has_version "dev-python/pylama[${PYTHON_USEDEP}]"; then
|
||||
EPYTEST_IGNORE+=(
|
||||
tests/unit/test_importable.py
|
||||
tests/unit/test_pylama_isort.py
|
||||
)
|
||||
fi
|
||||
|
||||
epytest tests/unit
|
||||
}
|
||||
Reference in New Issue
Block a user