Rebecca N. Palmer pushed to branch debian-v7 at Debian Med / snakemake
Commits: 95c52c07 by Rebecca N. Palmer at 2024-10-04T19:09:25+01:00 Stop using pkg_resources. (Closes: #1083775) - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/no_pkg_resources.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +snakemake (7.32.4-6) unstable; urgency=medium + + * Stop using pkg_resources. (Closes: #1083775) + + -- Rebecca N. Palmer <[email protected]> Fri, 04 Oct 2024 19:09:12 +0100 + snakemake (7.32.4-5) unstable; urgency=medium * Tests: revert extra debug output. ===================================== debian/control ===================================== @@ -28,7 +28,6 @@ Build-Depends: ca-certificates, python3-nbformat, python3-packaging, python3-pandas <!nocheck>, - python3-pkg-resources, python3-psutil, python3-pulp (>= 2.0~), python3-pygments <!nocheck>, @@ -74,7 +73,7 @@ Depends: ${misc:Depends}, python3-git, python3-jsonschema, python3-nbformat, - python3-pkg-resources, + python3-packaging, python3-psutil, python3-pulp (>= 2.0~), python3-ratelimiter, @@ -103,7 +102,6 @@ Recommends: cwltool, python3-ftputil, python3-irodsclient, python3-kubernetes, - python3-packaging, python3-retry, python3-urllib3 Suggests: slurm-client, ===================================== debian/patches/no_pkg_resources.patch ===================================== @@ -0,0 +1,20 @@ +Description: Stop using pkg_resources + +Author: Rebecca N. Palmer <[email protected]> +Bug-Debian: https://bugs.debian.org/1083775 +Forwarded: no + +--- a/snakemake/utils.py ++++ b/snakemake/utils.py +@@ -466,9 +466,9 @@ def read_job_properties( + + def min_version(version): + """Require minimum snakemake version, raise workflow error if not met.""" +- import pkg_resources ++ import packaging + +- if pkg_resources.parse_version(snakemake.__version__) < pkg_resources.parse_version( ++ if packaging.version.parse(snakemake.__version__) < packaging.version.parse( + version + ): + raise WorkflowError( ===================================== debian/patches/series ===================================== @@ -20,3 +20,4 @@ fstring.patch 1068010_appdirs_to_platformdirs.patch test_solver.patch test_extra_time.patch +no_pkg_resources.patch View it on GitLab: https://salsa.debian.org/med-team/snakemake/-/commit/95c52c0780451a7daf9b08a45db22d95b73c0fbd -- View it on GitLab: https://salsa.debian.org/med-team/snakemake/-/commit/95c52c0780451a7daf9b08a45db22d95b73c0fbd You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
