gentoo resync : 17.08.2021

4 files changed, 2 insertions, 88 deletions

diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index e8dcbee9c61d..f4326b6e4467 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,6 +1,3 @@
-AUX fsspec-2021.06.1-ujson.patch 1304 BLAKE2B 9a7a7580b7df2967c4d61b7334cb4561cc4a1ce056b9dab3d16bca132545edf6651291c6b69742421208c679b336017b0e92d7584ec24bf32eb26335a451b917 SHA512 5574a57ba32b678a35967c9560831feb993b5462ff986e2b4c9a3a93dfa497ceee206bed88a72cc41456dc255cf8aab4240f6c3fd624822cbe594c6839758324
-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
-EBUILD fsspec-2021.06.1.ebuild 1239 BLAKE2B 10d15d90196fa59f567185337c9d7330d981caff400180c0d0b40e01efe7896b80ddd0161d4460a8cda60d58d91e7407f560a176af89d54098f7733078c73b17 SHA512 b8c7232cb4b0937344908f13b4c5033b84cfc0c72f1c946bd5a34ba31389f41da9fe42cb321b85073ed7f89a7132472e64ff969efdb9a6610242b0b40b6292e8
-EBUILD fsspec-2021.07.0.ebuild 1196 BLAKE2B 6264230bccd83e7b2c525e622fd542d327f3cb7f1592033305748635ae528ca1ea319caf4cf6f369c211bd63df7452b9168ec72d0ecedaf924eb02c7e61d1afa SHA512 7908bd8aa040f87ca4b912894ef1195fbb7c1a2a4f203101def93c762363fc021884e92594c648b1e48fcaf692829bd91bdda946e0c096426a3939fb22f257d8
+EBUILD fsspec-2021.07.0.ebuild 1194 BLAKE2B 86eb9b6315ee7880e7a6eae31016ce27368015355f58b73f90a7a8a6edc48159b8922724194b90f0974d054cdd4bd49501acf190599f8b58db2889ab0524c9c6 SHA512 8c670917ecbebf5bdfd90ec50b35145eb74bf1599867991382036b981d171de1e9b380d276d260aec636fa1d73a501bc72ac60909d3032f52ad2d3697b320e74
 MISC metadata.xml 373 BLAKE2B 8932a3ec06759eeef7bb91a181e07ceeef606995e944a6396d21ee6f9b26a7958e9c40f9f54ae27ebdfb9c7974b1ad79963213bb7a5b9bbb282cf35967a1ffe9 SHA512 42e44963570b3b003550ef6f60d1557866a72f362a3d98ca2a7900377422921134e4c8b7bcb6af3ea8bc061b433e4aba96de4fa5643a1f424cc64665a7efd654
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 0c76d8ac71df..000000000000
--- 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?= <mgorny@gentoo.org>
-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 62cb55afaecf..000000000000
--- 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 "you@example.com" || 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
-}
diff --git a/dev-python/fsspec/fsspec-2021.07.0.ebuild b/dev-python/fsspec/fsspec-2021.07.0.ebuild
index 01506d4cf04b..366a8615eda1 100644
--- a/dev-python/fsspec/fsspec-2021.07.0.ebuild
+++ b/dev-python/fsspec/fsspec-2021.07.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]