From b17113b63dd656fd16872f64af99554c4a0148f8 Mon Sep 17 00:00:00 2001 From: Lucas Frérot Date: Fri, 3 Mar 2023 19:46:29 +0100 Subject: snakemake: added versions 7.19.0-7.22.0 (#35535) * snakemake: added versions 7.19.0-7.22.0 * snakemake: corrected +reports dependencies --- var/spack/repos/builtin/packages/snakemake/package.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/snakemake/package.py b/var/spack/repos/builtin/packages/snakemake/package.py index e1938899eb..a331b0e5c2 100644 --- a/var/spack/repos/builtin/packages/snakemake/package.py +++ b/var/spack/repos/builtin/packages/snakemake/package.py @@ -13,6 +13,11 @@ class Snakemake(PythonPackage): pypi = "snakemake/snakemake-6.12.3.tar.gz" maintainers("marcusboden") + version("7.22.0", sha256="68d7bb4ab7555f7b58a3ba748a880024df919042cfb670da231886385de697cd") + version("7.21.0", sha256="ebf91f4ca5c70809fcbfd2e8cbc982096cdadac1ec34138bb147b4a8c975c85b") + version("7.20.0", sha256="f5b45191f1d419ebf28606880cb9bfac3bfa7c5949d1d2b64f551586d4212a2a") + version("7.19.1", sha256="390ad5e2d5106e84700b7219c0eddf41d61be2205787d77a815fa91e4d624f33") + version("7.19.0", sha256="423bb6f10013d874b6b71c06cbb45b2935ce1a291f74e1fc1614efa44b08c3e7") version("7.18.2", sha256="23f52b9a0c86da3b974a3cfc097fa82b41c49dab05543c0d18377c854852f771") version("6.15.1", sha256="a219601d57037f565ead9963e6bd8d04d3bdd985d172371e54197dcbdba79865") version("6.13.1", sha256="22f57dcd8b1ca8a30aaa45c5d2c0f56d381d4731abd0988f24f9de46b7d9827c") @@ -21,6 +26,10 @@ class Snakemake(PythonPackage): depends_on("py-setuptools", type=("build", "run")) depends_on("py-setuptools@42:", type=("build", "run"), when="@7:") + # See https://github.com/snakemake/snakemake/pull/2065 + depends_on("py-tomli", type=("build"), when="@7.20.0: ^python@:3.10") + # See https://github.com/snakemake/snakemake/blob/v7.20.0/setup.cfg#L44 + depends_on("py-humanfriendly", type=("build", "run"), when="@7.20.0:") # See https://github.com/snakemake/snakemake/blob/v7.18.2/setup.py#L56 depends_on("py-wrapt", type=("build", "run")) depends_on("py-requests", type=("build", "run")) @@ -48,10 +57,11 @@ class Snakemake(PythonPackage): variant("reports", default=False, description="Generate self-contained HTML reports") with when("+reports"): - depends_on("py-jinja2", type=("build", "run")) - depends_on("py-networkx", type=("build", "run")) + depends_on("py-jinja2", type=("build", "run"), when="@:7.19.1") depends_on("py-pygments", type=("build", "run")) - depends_on("py-pygraphviz", type=("build", "run")) + # https://github.com/snakemake/snakemake/pull/1470 + depends_on("py-networkx", type=("build", "run"), when="@:7.1.1") + depends_on("py-pygraphviz", type=("build", "run"), when="@:7.1.1") variant("google-cloud", default=False, description="Enable Google Cloud execution") with when("+google-cloud"): -- cgit v1.2.3-60-g2f50