commit: f13dca1026d218ab2dd8f171af745483c7b87bdc Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Aug 16 06:24:07 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Aug 16 06:37:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13dca10
dev-python/fsspec: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/fsspec/Manifest | 1 - .../fsspec/files/fsspec-2021.06.1-ujson.patch | 32 -------------- dev-python/fsspec/fsspec-2021.06.1.ebuild | 51 ---------------------- 3 files changed, 84 deletions(-) diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest index e8f3add5e84..a90fa0c6515 100644 --- a/dev-python/fsspec/Manifest +++ b/dev-python/fsspec/Manifest @@ -1,2 +1 @@ -DIST filesystem_spec-2021.06.1.tar.gz 297254 BLAKE2B e360c0780df2ace31a2a7e15f7269f23140ddbc6bd6a1f657cfddbab2b1f285d79a0c88f8d63e406d4a53fd3737f77012eb9837479707a778ab043503ade9d18 SHA512 1d59c2c53b1a4a604ff3762eca8484d7ed60fba98548cc77d7ed014ddf1513cef046ceeec41911cdecd414bdbb4e3c669a3a3f65da08dabf5a70cc2985d06b73 DIST filesystem_spec-2021.07.0.tar.gz 301517 BLAKE2B 84b189e636eaeb4d3724e1afc44795e83b3ac576ab8640b4fee916bb7cf341c5cd6b1b475616225927693d13f204a1750f913f2e6d35b541fb8ff26ee1019400 SHA512 bea483734e6c9773d93ee93b526c8074a28f0671fbee17b39858dc7a75fd71553ca6d8d5c4e2204446bca3e7c23f6d4c8e94b62ff920e546a2b71786d0dcb388 diff --git a/dev-python/fsspec/files/fsspec-2021.06.1-ujson.patch b/dev-python/fsspec/files/fsspec-2021.06.1-ujson.patch deleted file mode 100644 index 0c76d8ac71d..00000000000 --- a/dev-python/fsspec/files/fsspec-2021.06.1-ujson.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 270423008d401d9f03a31f08c53a7b13fa193573 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Wed, 23 Jun 2021 09:23:31 +0200 -Subject: [PATCH] Fix test_unmodel to accept ujson encoding without whitespace - -The ujson encoding for test_unmodel data is b'"Conventions":"UGRID-0.9.0"' -(without a space after ':') that breaks the test for me. Update -the test to make the whitespace optional. - -That said, I have tried multiple ujson versions, going back to <3, -and was not able to reproduce the output with space. ---- - fsspec/implementations/tests/test_reference.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/fsspec/implementations/tests/test_reference.py b/fsspec/implementations/tests/test_reference.py -index a1a8fdc..15a32d5 100644 ---- a/fsspec/implementations/tests/test_reference.py -+++ b/fsspec/implementations/tests/test_reference.py -@@ -104,7 +104,8 @@ jdata = """{ - - def test_unmodel(): - refs = _unmodel_hdf5(json.loads(jdata)) -- assert b'"Conventions": "UGRID-0.9.0"' in refs[".zattrs"] -+ # apparently the output may or may not contain a space after ':' -+ assert b'"Conventions":"UGRID-0.9.0"' in refs[".zattrs"].replace(b' ', b'') - assert refs["adcirc_mesh/0"] == ("https://url";, 8928, 8932) - - --- -2.32.0 - diff --git a/dev-python/fsspec/fsspec-2021.06.1.ebuild b/dev-python/fsspec/fsspec-2021.06.1.ebuild deleted file mode 100644 index 62cb55afaec..00000000000 --- a/dev-python/fsspec/fsspec-2021.06.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) -inherit distutils-r1 - -MY_P=filesystem_spec-${PV} - -DESCRIPTION="A specification that python filesystems should adhere to" -HOMEPAGE="https://github.com/intake/filesystem_spec/ - https://pypi.org/project/fsspec/"; -SRC_URI=" - https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz - -> ${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" - -BDEPEND=" - dev-python/versioneer[${PYTHON_USEDEP}] - test? ( - dev-python/aiohttp[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-vcs/git - )" - -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}"/${P}-ujson.patch -) - -src_test() { - git config --global user.email "[email protected]" || die - git config --global user.name "Your Name" || die - distutils-r1_src_test -} - -python_test() { - # sftp and smb require server started via docker - epytest \ - --deselect fsspec/tests/test_spec.py::test_find \ - --ignore fsspec/implementations/tests/test_dbfs.py \ - --ignore fsspec/implementations/tests/test_sftp.py \ - --ignore fsspec/implementations/tests/test_smb.py -}
