From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BC83F158041 for ; Thu, 22 Feb 2024 07:27:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5AF8E29A9; Thu, 22 Feb 2024 07:27:06 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BEE22E29A9 for ; Thu, 22 Feb 2024 07:27:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB79A343211 for ; Thu, 22 Feb 2024 07:27:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BD31131B for ; Thu, 22 Feb 2024 07:27:04 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1708586800.05e867ed4f4ffc6bcbf57160225dcce103062057.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/datasets/, sci-libs/datasets/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/datasets/Manifest sci-libs/datasets/datasets-2.16.0.ebuild sci-libs/datasets/datasets-2.17.1.ebuild sci-libs/datasets/files/datasets-2.14.4-tests.patch sci-libs/datasets/files/datasets-2.16.0-tests.patch sci-libs/datasets/files/datasets-2.17.1-tests.patch X-VCS-Directories: sci-libs/datasets/files/ sci-libs/datasets/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 05e867ed4f4ffc6bcbf57160225dcce103062057 X-VCS-Branch: master Date: Thu, 22 Feb 2024 07:27:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8fd32872-b41e-4433-8ac9-d37d702fad35 X-Archives-Hash: 9bdddda55bfbe99595ae21948d4ba81a commit: 05e867ed4f4ffc6bcbf57160225dcce103062057 Author: Alfredo Tupone gentoo org> AuthorDate: Thu Feb 22 07:26:13 2024 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Thu Feb 22 07:26:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05e867ed sci-libs/datasets: add 2.17.1, drop 2.16.0 Bug: https://bugs.gentoo.org/921090 Signed-off-by: Alfredo Tupone gentoo.org> sci-libs/datasets/Manifest | 2 +- ...tasets-2.16.0.ebuild => datasets-2.17.1.ebuild} | 8 ++++-- .../datasets/files/datasets-2.14.4-tests.patch | 10 -------- ...6.0-tests.patch => datasets-2.17.1-tests.patch} | 29 ++++++++-------------- 4 files changed, 17 insertions(+), 32 deletions(-) diff --git a/sci-libs/datasets/Manifest b/sci-libs/datasets/Manifest index 0880ec7cb629..1b5292db6bf4 100644 --- a/sci-libs/datasets/Manifest +++ b/sci-libs/datasets/Manifest @@ -1 +1 @@ -DIST datasets-2.16.0.gh.tar.gz 2163874 BLAKE2B baec91a0e39fac3e07f11e352a286c0940cbc672e7233267e70d1abb64dd31bae18c55213a20fafaeaf2f60268104f294c77c9b73ddc1b289175904288a7c440 SHA512 f2a17ffab192163cfc196cc2bad0adb2ca657b5cf911f74f299b6e29eb4fcfacc377505b1857974a6b55252eedf8775a8706f9e991450c55e5d613020dc03735 +DIST datasets-2.17.1.gh.tar.gz 2168860 BLAKE2B ad7e9be7e60125d53b19b6277b6be6ae6050321e4210293a37737a345a4806d4901e9507fbf7a51c5e00a91912656d68a94e76cf70e070433beccc6e1ad54643 SHA512 43617c3d98cc3ad17fb577d6e917d164c8b6ec24740604ca281adaa2f0e5a6538633721792c9fa6621b7f1980161d8acf62dcdcdacca56e1739a8f28e3c71cdf diff --git a/sci-libs/datasets/datasets-2.16.0.ebuild b/sci-libs/datasets/datasets-2.17.1.ebuild similarity index 91% rename from sci-libs/datasets/datasets-2.16.0.ebuild rename to sci-libs/datasets/datasets-2.17.1.ebuild index a34fcaa2f89c..9b6295db1a0e 100644 --- a/sci-libs/datasets/datasets-2.16.0.ebuild +++ b/sci-libs/datasets/datasets-2.17.1.ebuild @@ -27,12 +27,16 @@ RDEPEND=" $(python_gen_cond_dep ' dev-python/absl-py[${PYTHON_USEDEP}] dev-python/aiohttp[${PYTHON_USEDEP}] + dev-python/dill[${PYTHON_USEDEP}] + dev-python/filelock[${PYTHON_USEDEP}] <=dev-python/fsspec-2023.10.0[${PYTHON_USEDEP}] dev-python/multiprocess[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] dev-python/pandas[${PYTHON_USEDEP}] dev-python/pyarrow[${PYTHON_USEDEP},parquet,snappy] dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] dev-python/tqdm[${PYTHON_USEDEP}] dev-python/xxhash[${PYTHON_USEDEP}] dev-python/zstandard[${PYTHON_USEDEP}] @@ -46,7 +50,7 @@ BDEPEND="test? ( dev-python/absl-py[${PYTHON_USEDEP}] dev-python/pytest-datadir[${PYTHON_USEDEP}] dev-python/decorator[${PYTHON_USEDEP}] - =dev-python/sqlalchemy-1*[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] sci-libs/jiwer[${PYTHON_USEDEP}] sci-libs/seqeval[${PYTHON_USEDEP}] ') @@ -79,5 +83,5 @@ src_prepare() { tests/test_streaming_download_manager.py \ tests/commands/test_test.py \ tests/packaged_modules/test_cache.py \ - die + || die } diff --git a/sci-libs/datasets/files/datasets-2.14.4-tests.patch b/sci-libs/datasets/files/datasets-2.14.4-tests.patch index 5dd322309b20..b9791c04e8e0 100644 --- a/sci-libs/datasets/files/datasets-2.14.4-tests.patch +++ b/sci-libs/datasets/files/datasets-2.14.4-tests.patch @@ -8,16 +8,6 @@ @pytest.mark.filterwarnings("ignore:metric_module_factory is deprecated:FutureWarning") @pytest.mark.filterwarnings("ignore:load_metric is deprecated:FutureWarning") def test_load_metric(self, metric_name): ---- a/tests/test_hf_gcp.py 2023-05-04 19:33:31.150825303 +0200 -+++ b/tests/test_hf_gcp.py 2023-05-04 19:40:08.401759538 +0200 -@@ -75,6 +75,7 @@ - self.assertTrue(os.path.exists(datset_info_path)) - - -+@pytest.mark.skip(reason="require apache_beam") - @pytest.mark.integration - def test_as_dataset_from_hf_gcs(tmp_path_factory): - tmp_dir = tmp_path_factory.mktemp("test_hf_gcp") / "test_wikipedia_simple" --- a/tests/test_distributed.py 2023-05-04 19:43:09.861275030 +0200 +++ b/tests/test_distributed.py 2023-05-04 19:44:17.608326722 +0200 @@ -74,6 +74,7 @@ diff --git a/sci-libs/datasets/files/datasets-2.16.0-tests.patch b/sci-libs/datasets/files/datasets-2.17.1-tests.patch similarity index 90% rename from sci-libs/datasets/files/datasets-2.16.0-tests.patch rename to sci-libs/datasets/files/datasets-2.17.1-tests.patch index 8cb89e824b3b..14ae50602d10 100644 --- a/sci-libs/datasets/files/datasets-2.16.0-tests.patch +++ b/sci-libs/datasets/files/datasets-2.17.1-tests.patch @@ -1,6 +1,6 @@ --- a/tests/test_arrow_dataset.py 2024-02-20 21:53:24.248470991 +0100 +++ b/tests/test_arrow_dataset.py 2024-02-20 21:53:29.441804737 +0100 -@@ -3982,7 +3982,6 @@ +@@ -4016,7 +4016,6 @@ [ "relative/path", "/absolute/path", @@ -10,15 +10,15 @@ ], --- a/tests/test_load.py 2024-02-20 22:12:13.699209107 +0100 +++ b/tests/test_load.py 2024-02-20 22:13:10.862626708 +0100 -@@ -386,6 +386,7 @@ +@@ -388,6 +388,7 @@ hf_modules_cache=self.hf_modules_cache, ) + @pytest.mark.skip(reason="") def test_HubDatasetModuleFactoryWithScript_dont_trust_remote_code(self): - # "squad" has a dataset script + # "lhoestq/test" has a dataset script factory = HubDatasetModuleFactoryWithScript( -@@ -402,6 +402,7 @@ +@@ -403,6 +404,7 @@ ) self.assertRaises(ValueError, factory.get_module) @@ -26,7 +26,7 @@ def test_HubDatasetModuleFactoryWithScript_with_github_dataset(self): # "wmt_t2t" has additional imports (internal) factory = HubDatasetModuleFactoryWithScript( -@@ -411,6 +412,7 @@ +@@ -412,6 +414,7 @@ assert importlib.import_module(module_factory_result.module_path) is not None assert module_factory_result.builder_kwargs["base_path"].startswith(config.HF_ENDPOINT) @@ -34,7 +34,7 @@ def test_GithubMetricModuleFactory_with_internal_import(self): # "squad_v2" requires additional imports (internal) factory = GithubMetricModuleFactory( -@@ -419,6 +421,7 @@ +@@ -420,6 +423,7 @@ module_factory_result = factory.get_module() assert importlib.import_module(module_factory_result.module_path) is not None @@ -42,7 +42,7 @@ @pytest.mark.filterwarnings("ignore:GithubMetricModuleFactory is deprecated:FutureWarning") def test_GithubMetricModuleFactory_with_external_import(self): # "bleu" requires additional imports (external from github) -@@ -1032,6 +1035,7 @@ +@@ -1033,6 +1037,7 @@ datasets.load_dataset_builder(SAMPLE_DATASET_TWO_CONFIG_IN_METADATA, "non-existing-config") @@ -50,7 +50,7 @@ @pytest.mark.parametrize("serializer", [pickle, dill]) def test_load_dataset_builder_with_metadata_configs_pickable(serializer): builder = datasets.load_dataset_builder(SAMPLE_DATASET_SINGLE_CONFIG_IN_METADATA) -@@ -1153,6 +1157,7 @@ +@@ -1154,6 +1159,7 @@ assert len(builder.config.data_files["test"]) > 0 @@ -58,7 +58,7 @@ def test_load_dataset_builder_fail(): with pytest.raises(DatasetNotFoundError): datasets.load_dataset_builder("blabla") -@@ -1168,6 +1173,7 @@ +@@ -1169,6 +1175,7 @@ assert isinstance(next(iter(dataset["train"])), dict) @@ -68,7 +68,7 @@ assert isinstance(dataset, DatasetDict) --- a/tests/test_hf_gcp.py 2024-02-21 09:59:26.918397895 +0100 +++ b/tests/test_hf_gcp.py 2024-02-21 09:59:46.335100597 +0100 -@@ -47,6 +47,7 @@ +@@ -45,6 +45,7 @@ ] @@ -78,15 +78,6 @@ dataset = None --- a/tests/test_inspect.py 2024-02-21 10:03:32.315520016 +0100 +++ b/tests/test_inspect.py 2024-02-21 10:03:50.345553490 +0100 -@@ -18,7 +18,7 @@ - pytestmark = pytest.mark.integration - - --@pytest.mark.parametrize("path", ["paws", csv.__file__]) -+@pytest.mark.parametrize("path", [csv.__file__]) - def test_inspect_dataset(path, tmp_path): - inspect_dataset(path, tmp_path) - script_name = Path(path).stem + ".py" @@ -49,6 +49,7 @@ assert list(info.splits.keys()) == expected_splits