[gentoo-commits] repo/gentoo:master commit in: dev-python/chardet/files/, dev-python/chardet/
commit: 538c378f478a29149ee668b582c78ac02f6ad0e1 Author: Michał Górny gentoo org> AuthorDate: Sun Oct 17 07:32:09 2021 + Commit: Michał Górny gentoo org> CommitDate: Sun Oct 17 07:32:09 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538c378f dev-python/chardet: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/chardet/Manifest| 1 - dev-python/chardet/chardet-3.0.4-r1.ebuild | 28 -- .../chardet/files/chardet-3.0.4-pytest-4.patch | 23 -- 3 files changed, 52 deletions(-) diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest index 1fa67aa0c09..ed73b3a9c79 100644 --- a/dev-python/chardet/Manifest +++ b/dev-python/chardet/Manifest @@ -1,2 +1 @@ -DIST chardet-3.0.4.tar.gz 1872214 BLAKE2B b93e2d3e0b5a5c35affa5e3ee661323029f79837a1222d8f69db72911301d9490c9788d2effc577eeeb2a50334cc855afc4bdf4b8dbafb143fcc411d93b824a9 SHA512 b433ea0e15e200df968e6d61c671c42fbd77e519eb033035c4a5c241e1f98e1dfaea6747af632788507583b3ef85b00d510b3f6ef5cf58589ceca1b3a088b357 DIST chardet-4.0.0.tar.gz 1923933 BLAKE2B 10dce34cbe6f01536a526931510ed625bc5062335e9419e24c9e48d5697ebbe70dcc54ffaa976ec153340cc74c3086627a3b1dd9e34be32c89a9a81e83fd70d0 SHA512 cb0e052fdd9fec251ebc6eb3f31ca95ece017f2bfa99122997f989286988058ed9688e49d00631c63d8e4e52da1050e23f02b28d0e739aee7302b24c8808370e diff --git a/dev-python/chardet/chardet-3.0.4-r1.ebuild b/dev-python/chardet/chardet-3.0.4-r1.ebuild deleted file mode 100644 index 747b00b7e04..000 --- a/dev-python/chardet/chardet-3.0.4-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{7..10} pypy3 ) -inherit distutils-r1 - -DESCRIPTION="Universal encoding detector" -HOMEPAGE="https://github.com/chardet/chardet https://pypi.org/project/chardet/"; -SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz" - -# SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" -# PyPI tarball is missing test.py: https://github.com/chardet/chardet/pull/118 - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - -DEPEND=" - test? ( dev-python/hypothesis[${PYTHON_USEDEP}] ) -" - -PATCHES=( - "${FILESDIR}"/${P}-pytest-4.patch -) - -distutils_enable_tests pytest diff --git a/dev-python/chardet/files/chardet-3.0.4-pytest-4.patch b/dev-python/chardet/files/chardet-3.0.4-pytest-4.patch deleted file mode 100644 index eef88e9e996..000 --- a/dev-python/chardet/files/chardet-3.0.4-pytest-4.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Tue, 12 Mar 2019 18:44:36 +0100 -Subject: [PATCH] Support pytest 4, don't apply marks directly to parameters - -Fixes https://github.com/chardet/chardet/issues/173 - test.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test.py b/test.py -index 9833307..ad2b753 100644 a/test.py -+++ b/test.py -@@ -59,7 +59,7 @@ def gen_test_params(): - full_path = join(path, file_name) - test_case = full_path, encoding - if full_path in EXPECTED_FAILURES: --test_case = pytest.mark.xfail(test_case) -+test_case = pytest.param(*test_case, marks=pytest.mark.xfail) - yield test_case - -
[gentoo-commits] repo/gentoo:master commit in: dev-python/chardet/files/, dev-python/chardet/
commit: f7ef746d3c03b89c9649c418d2f4d4f06303d807 Author: Tim Harder gentoo org> AuthorDate: Sun Oct 8 16:12:26 2017 + Commit: Tim Harder gentoo org> CommitDate: Sun Oct 8 16:24:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7ef746d dev-python/chardet: remove old dev-python/chardet/Manifest| 3 -- dev-python/chardet/chardet-2.3.0.ebuild| 20 -- dev-python/chardet/chardet-3.0.2.ebuild| 38 --- dev-python/chardet/chardet-3.0.3.ebuild| 40 .../chardet/files/disable-pytest-runner.patch | 44 -- 5 files changed, 145 deletions(-) diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest index f7ad10b570b..b6ea68331dd 100644 --- a/dev-python/chardet/Manifest +++ b/dev-python/chardet/Manifest @@ -1,4 +1 @@ -DIST chardet-2.3.0.tar.gz 164346 SHA256 e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa SHA512 d554c9b4564905a2b6c6971aaea2a812174d86b58137c6a2f9d54e2abd2395e6529968b2ce3ca2d97c717d2bd0bd80ab5b98cae9afac1a4add9ea305145030dd WHIRLPOOL af17bac2778a86d6fe9643a512a307cbcf92e4b43238b2d3d2bae53e646fccbdf40f31f41f9452e7d4f4c84d1ee637199af841a828d49f3452190749fee284c1 -DIST chardet-3.0.2.tar.gz 1872630 SHA256 3b92afd82ddea09d30832fac141840d6569c34f27633e4ad273c66172246116f SHA512 9466e8bdd4d49ca51664fefa170e2887bebf17d017d49056a0efe9baef4dc58e2a9e0766d41c1fcb06254e1346021d1d86b1eb55d4b71a061da93ea830f1dfce WHIRLPOOL 4010a838619b3f04d1266bdee49e26169724f1c83c38a3a9cc081fc8f2166e46ecf9544bc25e276a7dec4af7a64f469a74aabc8ecdc745fd10d364db331ee704 -DIST chardet-3.0.3.tar.gz 1872668 SHA256 99cc5d0c13fb0ec02bc4c8a35b35ff698ba1ebdb6d065b53276f0d10d59c2cdc SHA512 7769d80178fb9ded7f04c32969da1a73938b04ffcc9d8de2e593135731e29fbf1e2c21e39ca92d3789e08c9a800f9ec0aafc3c1d12580f4f1efb82e697700264 WHIRLPOOL 9ab8951cdcc69cc05974e67c421a5524bbdf18c96a5f272502b4ae22583520cbc7a82eb499de67cc5aac846af9db1279bc27581f3ce0afd73de2ead861663268 DIST chardet-3.0.4.tar.gz 1872214 SHA256 d5620025cfca430f6c2e28ddbc87c3c66a5c82fa65570ae975c92911c2190189 SHA512 b433ea0e15e200df968e6d61c671c42fbd77e519eb033035c4a5c241e1f98e1dfaea6747af632788507583b3ef85b00d510b3f6ef5cf58589ceca1b3a088b357 WHIRLPOOL cece99a2ed4a48f66232efc5d91ce228fcd83d3012a90099054bf214ad6f39e2b6250b139fb21b66469ccfd5b4bf8845846b50097f6fffda74c39fb742198355 diff --git a/dev-python/chardet/chardet-2.3.0.ebuild b/dev-python/chardet/chardet-2.3.0.ebuild deleted file mode 100644 index 709c76a767c..000 --- a/dev-python/chardet/chardet-2.3.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Universal encoding detector" -HOMEPAGE="https://github.com/chardet/chardet https://pypi.python.org/pypi/chardet"; -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" diff --git a/dev-python/chardet/chardet-3.0.2.ebuild b/dev-python/chardet/chardet-3.0.2.ebuild deleted file mode 100644 index 93934bd438a..000 --- a/dev-python/chardet/chardet-3.0.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Universal encoding detector" -HOMEPAGE="https://github.com/chardet/chardet https://pypi.python.org/pypi/chardet"; -# SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" -# PyPI tarball is missing test.py: https://github.com/chardet/chardet/pull/118 -SRC_URI="https://github.com/chardet/chardet/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}"/disable-pytest-runner.patch -) - -python_test() { - py.test -v || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/chardet/chardet-3.0.3.ebuild b/dev-python/chardet/chardet-3.0.3.ebuild deleted file mode 100644 index b57346e262b..000 --- a/dev-python/chardet/chardet-3.0.3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distrib
[gentoo-commits] repo/gentoo:master commit in: dev-python/chardet/files/
commit: d0a97429c4ec66b4d79114a3ba082c4275bcd193 Author: Zac Medico gentoo org> AuthorDate: Sat Apr 22 20:48:20 2017 + Commit: Zac Medico gentoo org> CommitDate: Sat Apr 22 20:51:55 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0a97429 dev-python/chardet: sync pytest-runner patch with upstream Package-Manager: Portage-2.3.5, Repoman-2.3.2 .../chardet/files/disable-pytest-runner.patch | 36 +- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/dev-python/chardet/files/disable-pytest-runner.patch b/dev-python/chardet/files/disable-pytest-runner.patch index 42869a4b481..affbc134148 100644 --- a/dev-python/chardet/files/disable-pytest-runner.patch +++ b/dev-python/chardet/files/disable-pytest-runner.patch @@ -1,21 +1,41 @@ -From 8d5291ff2c2560cf88ef7c38d90ca6d026c9d11c Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Thu, 20 Apr 2017 15:18:35 -0400 -Subject: [PATCH] Remove dependency on pytest-runner +From b874c25b08edd6bdbdd70a439c6cd603d6830226 Mon Sep 17 00:00:00 2001 +From: Zac Medico +Date: Fri, 21 Apr 2017 08:36:14 -0700 +Subject: [PATCH] setup.py: require pytest-runner only when necessary (#119) +This optimizes setup.py for cases when pytest-runner is not needed, +using the approach that is suggested upstream: + +https://pypi.python.org/pypi/pytest-runner#conditional-requirement --- - setup.py | 1 - - 1 file changed, 1 deletion(-) + setup.py | 7 ++- + 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 28a080a..ab49d62 100755 +index 28a080a..c214352 100755 --- a/setup.py +++ b/setup.py -@@ -46,7 +46,6 @@ setup(name='chardet', +@@ -1,9 +1,14 @@ + #!/usr/bin/env python + import re ++import sys + + from setuptools import find_packages, setup + + ++needs_pytest = set(['pytest', 'test', 'ptr']).intersection(sys.argv) ++pytest_runner = ['pytest-runner'] if needs_pytest else [] ++ ++ + # Get version without importing, which avoids dependency issues + def get_version(): + with open('chardet/version.py') as version_file: +@@ -46,7 +51,7 @@ setup(name='chardet', "Modules"), "Topic :: Text Processing :: Linguistic"], packages=find_packages(), - setup_requires=['pytest-runner'], ++ setup_requires=pytest_runner, tests_require=['pytest', 'hypothesis'], entry_points={'console_scripts': ['chardetect = chardet.cli.chardetect:main']})