From 05ff7e657c76255373c4feab9ef28201e9f1a732 Mon Sep 17 00:00:00 2001 From: snehring <7978778+snehring@users.noreply.github.com> Date: Fri, 18 Nov 2022 11:33:57 -0600 Subject: [PATCH] py-cutadapt: adding version 4.1 (#33959) * py-dnaio: adding version 0.9.1 py-cutadapt: adding version 4.1 * py-cutadapt: remove old python versions * py-dnaio: remove old python versions * py-cutadapt: add cython dep --- .../builtin/packages/py-cutadapt/package.py | 19 ++++++++++++------- .../builtin/packages/py-dnaio/package.py | 11 ++++++++--- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-cutadapt/package.py b/var/spack/repos/builtin/packages/py-cutadapt/package.py index feddbc78f0..119e2e605a 100644 --- a/var/spack/repos/builtin/packages/py-cutadapt/package.py +++ b/var/spack/repos/builtin/packages/py-cutadapt/package.py @@ -15,23 +15,28 @@ class PyCutadapt(PythonPackage): pypi = "cutadapt/cutadapt-1.13.tar.gz" git = "https://github.com/marcelm/cutadapt.git" + version("4.1", sha256="be745ff24adfb4a3eaf715dfad0e2ccdfad7792ef00c1122adf4fbf3aed9227b") version("2.10", sha256="936b88374b5b393a954852a0fe317a85b798dd4faf5ec52cf3ef4f3c062c242a") version("2.9", sha256="cad8875b461ca09cea498b4f0e78b0d3dcd7ea84d27d51dac4ed45080bf1499e") version("2.5", sha256="ced79e49b93e922e579d0bb9d21298dcb2d7b7b1ea721feed484277e08b1660b") version("1.13", sha256="aa9f2c1f33dc081fe94f42b1250e4382b8fb42cabbf6e70a76ff079f211d5fc0") - depends_on("python@2.6:", type=("build", "run"), when="@1.13") - depends_on("python@3.4:", type=("build", "run"), when="@2.0:2.5") - depends_on("python@3.5:", type=("build", "run"), when="@2.6:") - depends_on("py-setuptools", type=("build", "run")) - depends_on("py-setuptools-scm", type="build", when="@2.0:") + # universal deps + depends_on("py-setuptools@43:", type=("build", "run")) + depends_on("py-setuptools-scm@6.2:", type="build", when="@2.0:") + depends_on("python@3.7:", type=("build", "run"), when="@4.1:") + depends_on("py-cython@0.29.20:", type=("build", "run")) + # 4.1 deps + depends_on("py-dnaio@0.7.1:", type=("build", "run"), when="@4.1:") + depends_on("py-xopen@1.1:", type=("build", "run"), when="@4.1:") + # older version deps depends_on("py-xopen@0.1.1:", type=("build", "run"), when="@1.13") depends_on("py-xopen@0.5.0:", type=("build", "run"), when="@2.0:2.3") depends_on("py-xopen@0.7.3:", type=("build", "run"), when="@2.4") depends_on("py-xopen@0.8.1:0.8", type=("build", "run"), when="@2.5") - depends_on("py-xopen@0.8.4:0.8", type=("build", "run"), when="@2.6:") + depends_on("py-xopen@0.8.4:0.8", type=("build", "run"), when="@2.6:2.10") depends_on("py-dnaio@0.3:", type=("build", "run"), when="@2.0:2.4") depends_on("py-dnaio@0.3.0:0.3", type=("build", "run"), when="@2.5") depends_on("py-dnaio@0.4.0:0.4", type=("build", "run"), when="@2.6") depends_on("py-dnaio@0.4.1:0.4", type=("build", "run"), when="@2.7:2.9") - depends_on("py-dnaio@0.4.2:0.4", type=("build", "run"), when="@2.10:") + depends_on("py-dnaio@0.4.2:0.4", type=("build", "run"), when="@2.10") diff --git a/var/spack/repos/builtin/packages/py-dnaio/package.py b/var/spack/repos/builtin/packages/py-dnaio/package.py index 5aff7e922c..8c373bd1d7 100644 --- a/var/spack/repos/builtin/packages/py-dnaio/package.py +++ b/var/spack/repos/builtin/packages/py-dnaio/package.py @@ -13,11 +13,16 @@ class PyDnaio(PythonPackage): pypi = "dnaio/dnaio-0.3.tar.gz" git = "https://github.com/marcelm/dnaio.git" + version("0.9.1", sha256="a1a14181995b27197b7e2b8897994a3107c649b9fc2dfe263caff3c455b0d0c4") version("0.4.2", sha256="fa55a45bfd5d9272409b714158fb3a7de5dceac1034a0af84502c7f503ee84f8") version("0.3", sha256="47e4449affad0981978fe986684fc0d9c39736f05a157f6cf80e54dae0a92638") - depends_on("python@3.4:", type=("build", "run")) - depends_on("py-setuptools", type=("build", "run")) - depends_on("py-setuptools-scm", when="@0.4:", type="build") + depends_on("py-setuptools@52:", type=("build", "run")) + depends_on("py-setuptools-scm@6.2:", when="@0.4:", type="build") + # 0.9.1 deps + depends_on("python@3.7:", type=("build", "run"), when="@0.9.1:") + depends_on("py-cython@0.29.20:", type=("build", "run"), when="@0.9.1:") + depends_on("py-xopen@1.4.0:", type=("build", "run"), when="@0.9.1:") + # older deps depends_on("py-xopen", type=("build", "run")) depends_on("py-xopen@0.8.2:", when="@0.4:", type=("build", "run"))