From 4583148f2657a7a66fd68b25c9fab02be110c989 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Dec 2022 02:00:51 +0000 Subject: gentoo auto-resync : 24:12:2022 - 02:00:50 --- dev-python/Manifest.gz | Bin 260406 -> 260391 bytes dev-python/caldav/Manifest | 2 - dev-python/caldav/caldav-0.10.ebuild | 42 -------- dev-python/cchardet/Manifest | 2 + dev-python/cchardet/cchardet-2.1.7-r1.ebuild | 30 ++++++ .../cchardet/files/cchardet-2.1.7-pytest.patch | 120 +++++++++++++++++++++ 6 files changed, 152 insertions(+), 44 deletions(-) delete mode 100644 dev-python/caldav/caldav-0.10.ebuild create mode 100644 dev-python/cchardet/cchardet-2.1.7-r1.ebuild create mode 100644 dev-python/cchardet/files/cchardet-2.1.7-pytest.patch (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 96de0f8c2ea2..5d65da215030 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/caldav/Manifest b/dev-python/caldav/Manifest index 4dd541075b79..1a85539657d0 100644 --- a/dev-python/caldav/Manifest +++ b/dev-python/caldav/Manifest @@ -1,5 +1,3 @@ -DIST caldav-0.10.gh.tar.gz 121800 BLAKE2B 6398e2e94f40e6c0d8fa757a02ae2aedcdc2bef59be9b6499a9ff86304ee2280222ff4490b9cf6fe2b37bd1e5031e17f472afbd0e42da2a82a27aec87cfecd08 SHA512 1cd98a3f59381c238ba424a30a6596e969c04bcab74cd1f9cbf9bae1da32d23b12a718135252a12fc069091994ef451bf504a05097d9539a79b397370c55609f DIST caldav-0.11.0.gh.tar.gz 126186 BLAKE2B 0d818ea5e76b88b3ea18f1fd878a297fa88ad9921d994a61d05c02aa80b73ac40bd8cb36810a050d8f6a87009911655b64a8a4ef09133cb751a225adacdd5575 SHA512 761753fa86e2ba9788030df1af482177bd01ee266a7fe8da744ac85eee95a74d1450e1afa0f64109b9c12aaedba0354d76da2ee9b27dec2771141fc453727d4f -EBUILD caldav-0.10.ebuild 976 BLAKE2B e9fc1c933cadaa68715a872872c920bd52ca116a715cd8889ceeb111f41fabee9fa390a00064d30a33a29eaf5aae59fb4dd984b2c69d707baa87e694d15795a8 SHA512 0aebe3b8b30496ff0597cf4b372eb2a37436a4c0d875e6e02d0997b0f9ff689794aecad23fa8f1ad80c1be38463fca1c82cbcf33a4c004a746d532b37d3bedaa EBUILD caldav-0.11.0.ebuild 1295 BLAKE2B 040de0a23aabad8160e25e9b9c97f47cdd7d7bfc701d1734acd6d5c80480d626629bb8cdf0651b998905d8be121ebc7385318b45591a31b7634e9ac73c0f11e5 SHA512 998b3776e201dd5da65a018c45baa72104daa4f3f41fdc98cd94dbcfd3b01897f52c4056c333125b74e483f1e3c4205be0b93712a121f14b1958fc5c20c7f908 MISC metadata.xml 394 BLAKE2B f0b9c600418cbbc4c935d53b63f4e6c1235500984ed388ceb26c6e02fdb7200eec1464d8c4af17e6afdf3688479f0a0763e6e710f916c1c71dab2ca84df9509f SHA512 4f94039805c6cbfb97a667d555af39bcce7f10db8a7c61f3b8b48a903fcd52d3e30467c91c9ec13195be6dc3c4ccbfa088aeac390d5e1c64e9267527a8b77b6b diff --git a/dev-python/caldav/caldav-0.10.ebuild b/dev-python/caldav/caldav-0.10.ebuild deleted file mode 100644 index 8e3e203bff9b..000000000000 --- a/dev-python/caldav/caldav-0.10.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) - -inherit distutils-r1 - -DESCRIPTION="CalDAV (RFC4791) client library for Python" -HOMEPAGE=" - https://github.com/python-caldav/caldav - https://pypi.org/project/caldav/ -" -SRC_URI=" - https://github.com/python-caldav/caldav/archive/refs/tags/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="|| ( GPL-3 Apache-2.0 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/vobject[${PYTHON_USEDEP}] -" -# For now, really does use nose imports: bug #857738 -BDEPEND=" - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/icalendar[${PYTHON_USEDEP}] - dev-python/tzlocal[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - www-apps/radicale[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest diff --git a/dev-python/cchardet/Manifest b/dev-python/cchardet/Manifest index 96c4640c7f6b..d5730bb6c0c5 100644 --- a/dev-python/cchardet/Manifest +++ b/dev-python/cchardet/Manifest @@ -1,3 +1,5 @@ +AUX cchardet-2.1.7-pytest.patch 3529 BLAKE2B 2ce0bb1a7ee281477f471dad08b1e7819b9d47b96db2c4321b67185dd860de5f4e94150846e76ab8364bee079f823884af366256c8ad98ef0797987d2cab9a0c SHA512 0e7d126a49c3c1d2c810085aa1dd6fa1b1b38807876d168d3d459ea837bb8e146e0585c93a10599713a5511a76c328696ee0889d4c9a63ef8aee4d97b5df686a DIST cchardet-2.1.7.tar.gz 653617 BLAKE2B 0ca9becac01c67da191290c7de0dc52d5c8e6c2715f660811c8e67d9a06e74ac155a081de81af96ade74ccc4065093fc226f232a26f66236fafe9fc1b48a9c9e SHA512 43e663e30ec079b2a954862de5e8136a2e40f69e300d65eb4ce9d7ffa5d8c496dc7c0937b3306b4096cfad12a1d0617628f8f0115534ab6faf9eb39d2b3935a2 +EBUILD cchardet-2.1.7-r1.ebuild 632 BLAKE2B 910cdcde8902d74a17609ca8f768db9a0b33093313ae9589e9bae45b4c52d84856075f0c24825e0c45910e08bc01f7f2d369edefed2fac5820c31558ba6edce3 SHA512 451dbdb2b50d21d5172090b8043b4240296a03bbb3ab23badde91945486d6ca270acffc6dcf7eae5eb43d9bac60468605b357b12170bf63576f090031f521e5d EBUILD cchardet-2.1.7.ebuild 646 BLAKE2B 8648dd6bcb94fcfa5245df1c5cbe41e13844b44adf882c3bf27f5a65cd5cf2c88145a3ed032b276bccf8162bb15c66b527c6c6bcc7447303eefa63f178f5b207 SHA512 38da8f1dee07329aabc28efae0911ed6769c02e89e8a0facdb9dc6eed399a3b2988d3bd181f5d72660e13fb6164df927eed7e9857e861bbe7b60457d3188703e MISC metadata.xml 346 BLAKE2B 86fd035032c4a4223ca8b8b7db0b3593b60676376b17ebc0c2a02ccce6d4dd22f7bcc80350634378bfd9afb44640a4f8798dad5f479024510c90b0a2f9425eb9 SHA512 f33d9efa195ef267c11565d657fdbfdc6b11af571b812e7ce9885b41ab7e48c4e58422618ebf6809d7e1adab00977996d86ac7fe4f47b0db4267a34d16607805 diff --git a/dev-python/cchardet/cchardet-2.1.7-r1.ebuild b/dev-python/cchardet/cchardet-2.1.7-r1.ebuild new file mode 100644 index 000000000000..4f344e9f6e57 --- /dev/null +++ b/dev-python/cchardet/cchardet-2.1.7-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) +inherit distutils-r1 + +DESCRIPTION="High speed universal character encoding detector" +HOMEPAGE=" + https://github.com/PyYoshi/cChardet + https://pypi.org/project/cchardet/ +" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +BDEPEND=" + dev-python/cython[${PYTHON_USEDEP}] +" + +PATCHES=( + # https://github.com/PyYoshi/cChardet/pull/78 + "${FILESDIR}/${P}-pytest.patch" +) + +distutils_enable_tests pytest diff --git a/dev-python/cchardet/files/cchardet-2.1.7-pytest.patch b/dev-python/cchardet/files/cchardet-2.1.7-pytest.patch new file mode 100644 index 000000000000..11f38579c184 --- /dev/null +++ b/dev-python/cchardet/files/cchardet-2.1.7-pytest.patch @@ -0,0 +1,120 @@ +https://github.com/PyYoshi/cChardet/pull/78 + +From: q0w <43147888+q0w@users.noreply.github.com> +Date: Wed, 17 Nov 2021 14:50:41 +0300 +Subject: [PATCH 02/13] Use pytest + +--- /dev/null ++++ b/src/tests/cchardet_test.py +@@ -0,0 +1,111 @@ ++import glob ++import os ++ ++import cchardet ++ ++SKIP_LIST = [ ++ 'src/tests/testdata/ja/utf-16le.txt', ++ 'src/tests/testdata/ja/utf-16be.txt', ++ 'src/tests/testdata/es/iso-8859-15.txt', ++ 'src/tests/testdata/da/iso-8859-1.txt', ++ 'src/tests/testdata/he/iso-8859-8.txt' ++] ++ ++# Python can't decode encoding ++SKIP_LIST_02 = [ ++ 'src/tests/testdata/vi/viscii.txt', ++ 'src/tests/testdata/zh/euc-tw.txt' ++] ++SKIP_LIST_02.extend(SKIP_LIST) ++ ++ ++def test_ascii(): ++ detected_encoding = cchardet.detect(b'abcdefghijklmnopqrstuvwxyz') ++ assert 'ascii' == detected_encoding['encoding'].lower() ++ ++ ++def test_detect(): ++ testfiles = glob.glob('src/tests/testdata/*/*.txt') ++ for testfile in testfiles: ++ if testfile.replace("\\", "/") in SKIP_LIST: ++ continue ++ ++ base = os.path.basename(testfile) ++ expected_charset = os.path.splitext(base)[0] ++ with open(testfile, 'rb') as f: ++ msg = f.read() ++ detected_encoding = cchardet.detect(msg) ++ assert expected_charset.lower() == detected_encoding['encoding'].lower() ++ ++ ++def test_detector(): ++ detector = cchardet.UniversalDetector() ++ with open("src/tests/samples/wikipediaJa_One_Thousand_and_One_Nights_SJIS.txt", 'rb') as f: ++ line = f.readline() ++ while line: ++ detector.feed(line) ++ if detector.done: ++ break ++ line = f.readline() ++ detector.close() ++ detected_encoding = detector.result ++ assert "shift_jis" == detected_encoding['encoding'].lower() ++ ++ ++def test_github_issue_20(): ++ """ ++ https://github.com/PyYoshi/cChardet/issues/20 ++ """ ++ msg = b'\x8f' ++ ++ cchardet.detect(msg) ++ ++ detector = cchardet.UniversalDetector() ++ detector.feed(msg) ++ detector.close() ++ ++ ++def test_decode(): ++ testfiles = glob.glob('src/tests/testdata/*/*.txt') ++ for testfile in testfiles: ++ if testfile.replace("\\", "/") in SKIP_LIST_02: ++ continue ++ ++ base = os.path.basename(testfile) ++ expected_charset = os.path.splitext(base)[0] ++ with open(testfile, 'rb') as f: ++ msg = f.read() ++ detected_encoding = cchardet.detect(msg) ++ try: ++ msg.decode(detected_encoding["encoding"]) ++ except LookupError as e: ++ print("LookupError: { file=%s, encoding=%s }" % ( ++ testfile, detected_encoding["encoding"])) ++ raise e ++ ++ ++def test_utf8_with_bom(): ++ sample = b'\xEF\xBB\xBF' ++ detected_encoding = cchardet.detect(sample) ++ assert "utf-8-sig" == detected_encoding['encoding'].lower() ++ ++ ++def test_null_bytes(): ++ sample = b'ABC\x00\x80\x81' ++ detected_encoding = cchardet.detect(sample) ++ ++ assert detected_encoding['encoding'] is None ++ ++# def test_iso8859_2_csv(self): ++# testfile = 'tests/samples/iso8859-2.csv' ++# with open(testfile, 'rb') as f: ++# msg = f.read() ++# detected_encoding = cchardet.detect(msg) ++# eq_( ++# "iso8859-2", ++# detected_encoding['encoding'].lower(), ++# 'Expected %s, but got %s' % ( ++# "iso8859-2", ++# detected_encoding['encoding'].lower() ++# ) ++# ) -- cgit v1.2.3