From 1211ed75f4074ee56ad71bb32f8ae985fbb88a39 Mon Sep 17 00:00:00 2001 From: Michael Schubert Date: Mon, 11 Nov 2024 13:44:34 +0000 Subject: [PATCH] dev-python/snakemake: version bump 8.25.2 and enable tests Signed-off-by: Michael Schubert --- dev-python/snakemake/Manifest | 2 +- ...-8.16.0.ebuild => snakemake-8.25.2.ebuild} | 33 +++++++++---------- 2 files changed, 16 insertions(+), 19 deletions(-) rename dev-python/snakemake/{snakemake-8.16.0.ebuild => snakemake-8.25.2.ebuild} (75%) diff --git a/dev-python/snakemake/Manifest b/dev-python/snakemake/Manifest index de40275376f..34023bc3063 100644 --- a/dev-python/snakemake/Manifest +++ b/dev-python/snakemake/Manifest @@ -1,2 +1,2 @@ DIST snakemake-7.32.4.gh.tar.gz 8885863 BLAKE2B 6bb7ff4722dd06f0edf5e8079b42f5e54d6f55f41e2987b7dae7f9b75df0d4d836138e28340e5977107a5cc0b5afe793b0d7897c501246cc1b4340eb4eca2f17 SHA512 34fef61528b18facab798652c88ed5c698ef02161e023255fdd024b7c7781c4e582cdb04b2740fdff9b6f3600acaec719742984acee57920bb48ef3b5af99d9a -DIST snakemake-8.16.0.gh.tar.gz 8665306 BLAKE2B 76d3455ce9a7ccc749adb5a729ab954d7a3fd97dc2432c3a0e9aba1ace1cb08e377244a2a2527c676b9709f9bb8b5af29948c0385657755bbbc8449b136fc26d SHA512 29b6ba6da5dbbd347dee45114b949c976973555c9234f8a150dcd83e4af1638c1773590320bc44284cf20ea445efb377dcf9199921ed2b4d62bad3a60a41af3c +DIST snakemake-8.25.2.gh.tar.gz 8691649 BLAKE2B 34b50676ed158988d9ccd3fe80096d34bb0cf0b10d8ff0bc82b6abf9f727e08ed5996589ecf6374e66064ab25f8b42f0561cebe9c922b0c9b76af8cad7f2271d SHA512 7ba67ee9dfc873c69a11b1db0c51426018cf09a998c64c939a324da79e0047c5afa9877ddac41edff46ef6630712ab8ffe5a175cbefbea7bcb9fd44cd85a61b3 diff --git a/dev-python/snakemake/snakemake-8.16.0.ebuild b/dev-python/snakemake/snakemake-8.25.2.ebuild similarity index 75% rename from dev-python/snakemake/snakemake-8.16.0.ebuild rename to dev-python/snakemake/snakemake-8.25.2.ebuild index f83e8feb985..0734b752d90 100644 --- a/dev-python/snakemake/snakemake-8.16.0.ebuild +++ b/dev-python/snakemake/snakemake-8.25.2.ebuild @@ -16,21 +16,6 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" -# cannot import name '_helpers' from 'google.cloud' -RESTRICT="test" - -BDEPEND=" - dev-python/tomli[${PYTHON_USEDEP}] - test? ( - dev-python/requests-mock[${PYTHON_USEDEP}] - dev-python/google-api-python-client[${PYTHON_USEDEP}] - dev-python/networkx[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/pygraphviz[${PYTHON_USEDEP}] - net-libs/google-cloud-cpp - ) -" - RDEPEND=" dev-python/appdirs[${PYTHON_USEDEP}] dev-python/immutables[${PYTHON_USEDEP}] @@ -50,13 +35,12 @@ RDEPEND=" dev-python/reretry[${PYTHON_USEDEP}] >=dev-python/smart-open-4.0[${PYTHON_USEDEP}] >=dev-python/snakemake-interface-common-1.17.0[${PYTHON_USEDEP}] - >=dev-python/snakemake-interface-executor-plugins-9.2.0[${PYTHON_USEDEP}] + >=dev-python/snakemake-interface-executor-plugins-9.3.2[${PYTHON_USEDEP}] >=dev-python/snakemake-interface-storage-plugins-3.2.3[${PYTHON_USEDEP}] - >=dev-python/snakemake-interface-report-plugins-1.0.0[${PYTHON_USEDEP}] + >=dev-python/snakemake-interface-report-plugins-1.1.0[${PYTHON_USEDEP}] dev-python/stopit[${PYTHON_USEDEP}] dev-python/tabulate[${PYTHON_USEDEP}] dev-python/throttler[${PYTHON_USEDEP}] - >=dev-python/toposort-1.10[${PYTHON_USEDEP}] dev-python/wrapt[${PYTHON_USEDEP}] >=dev-python/yte-1.5.1[${PYTHON_USEDEP}] >=dev-python/dpath-2.1.6[${PYTHON_USEDEP}] @@ -71,4 +55,17 @@ RDEPEND=" # dev-python/docutils \ # dev-python/recommonmark \ # dev-python/myst-parser + +EPYTEST_IGNORE=( + # __file__ attribute does not match test name ('python_3_7') + tests/test_conda_python_3_7_script/test_script.py + # ModuleNotFoundError: No module named 'snakemake_executor_plugin_cluster_generic' + tests/test_executor_test_suite.py + # ImportError: cannot import name 'snakemake' from 'snakemake.script' + tests/test_script_py/scripts/test_explicit_import.py +) +EPYTEST_DESELECT=( + # No module named 'snakemake_storage_plugin_s3' + tests/test_api.py::test_deploy_sources +) distutils_enable_tests pytest