diff options
author | Luke Diorio-Toth <ldioriototh@gmail.com> | 2022-09-20 12:14:01 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-20 11:14:01 -0600 |
commit | cc0e7c87c17cf3ed66d896792d9c0d6907b35200 (patch) | |
tree | e020576e204fd09339c65d66d0b1b4ecfc43a37c | |
parent | 757a2db741e17d942cffc533418d1f15c60f8b00 (diff) | |
download | spack-cc0e7c87c17cf3ed66d896792d9c0d6907b35200.tar.gz spack-cc0e7c87c17cf3ed66d896792d9c0d6907b35200.tar.bz2 spack-cc0e7c87c17cf3ed66d896792d9c0d6907b35200.tar.xz spack-cc0e7c87c17cf3ed66d896792d9c0d6907b35200.zip |
new version (py-multiqc v1.13) + new package (py-rich-click) (#32719)
* started updating multiqc package
* working now
* added py-rich-click
* fixed style
* changed py-matlibplot versions
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* changed py-networkx versions
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* changed py-coloredlogs versions
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* changed python versions
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* changed py-markdown versions
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* changed py-pyyaml requirement
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* changed py-requests requirements
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
* changed py-spectra requirements
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
-rw-r--r-- | var/spack/repos/builtin/packages/py-multiqc/package.py | 26 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/py-rich-click/package.py | 23 |
2 files changed, 42 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/py-multiqc/package.py b/var/spack/repos/builtin/packages/py-multiqc/package.py index 6d96fdb948..db431b7f34 100644 --- a/var/spack/repos/builtin/packages/py-multiqc/package.py +++ b/var/spack/repos/builtin/packages/py-multiqc/package.py @@ -14,23 +14,35 @@ class PyMultiqc(PythonPackage): homepage = "https://multiqc.info" pypi = "multiqc/multiqc-1.0.tar.gz" + version("1.13", sha256="0564fb0f894e6ca0822a0f860941b3ed2c33dce407395ac0c2103775d45cbfa0") version("1.7", sha256="02e6a7fac7cd9ed036dcc6c92b8f8bcacbd28983ba6be53afb35e08868bd2d68") version("1.5", sha256="fe0ffd2b0d1067365ba4e54ae8991f2f779c7c684b037549b617020ea883310a") version("1.3", sha256="cde17845680131e16521ace04235bb9496c78c44cdc7b5a0fb6fd93f4ad7a13b") version("1.0", sha256="1a49331a3d3f2e591a6e9902bc99b16e9205731f0cd2d6eaeee0da3d0f0664c9") - depends_on("python@2.7:") + depends_on("python@2.7:", when="@:1.7", type=("build", "run")) + depends_on("python@3:", when="@1.9:", type=("build", "run")) depends_on("py-setuptools", type="build") + depends_on("py-matplotlib@2.1.1:", type=("build", "run"), when="@:1.13") + depends_on("py-matplotlib@2.1.1:2", type=("build", "run"), when="@1.7") + depends_on("py-matplotlib@:2.1.0", type=("build", "run"), when="@1.5") + depends_on("py-matplotlib", type=("build", "run"), when="@:1.3") + depends_on("py-networkx@2.5.1:", type=("build", "run"), when="@1.13:") + depends_on("py-networkx@:1", type=("build", "run"), when="@1.3") + depends_on("py-numpy", type=("build", "run")) depends_on("py-click", type=("build", "run")) + depends_on("py-coloredlogs", type=("build", "run"), when="@1.13:") + depends_on("py-future@0.14.1:", type=("build", "run")) depends_on("py-jinja2@2.9:", type=("build", "run")) depends_on("py-lzstring", type=("build", "run")) - depends_on("py-future@0.14.1:", type=("build", "run")) - depends_on("py-spectra@0.0.10:", type=("build", "run")) - depends_on("py-matplotlib@2.0.0:2.9.9", type=("build", "run")) - depends_on("py-numpy", type=("build", "run")) + depends_on("py-markdown", type=("build", "run"), when="@1.3:") depends_on("py-pyyaml", type=("build", "run")) + depends_on("py-pyyaml@4:", type=("build", "run"), when="@1.13:") + depends_on("py-requests", type=("build", "run"), when="@1.3:") + depends_on("py-rich@10:", type=("build", "run"), when="@1.13:") + depends_on("py-rich-click", type=("build", "run"), when="@1.13:") depends_on("py-simplejson", type=("build", "run")) - depends_on("py-requests", type=("build", "run"), when="@1.5:") + depends_on("py-spectra@0.0.10:", type=("build", "run"), when="@1.5:") + depends_on("py-spectra", type=("build", "run")) depends_on("py-enum34", type=("build", "run"), when="@1.4:1.5 ^python@:3.3") depends_on("py-enum34", type=("build", "run"), when="@1.3") - depends_on("py-markdown", type=("build", "run"), when="@1.5:") diff --git a/var/spack/repos/builtin/packages/py-rich-click/package.py b/var/spack/repos/builtin/packages/py-rich-click/package.py new file mode 100644 index 0000000000..f9de7328ff --- /dev/null +++ b/var/spack/repos/builtin/packages/py-rich-click/package.py @@ -0,0 +1,23 @@ +# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +from spack.package import * + + +class PyRichClick(PythonPackage): + """The intention of rich-click is to provide attractive help output + from click, formatted with rich, with minimal customisation required.""" + + homepage = "https://github.com/ewels/rich-click" + pypi = "rich-click/rich-click-1.5.2.tar.gz" + + version("1.5.2", sha256="a57ca70242cb8b372a670eaa0b0be48f2440b66656deb4a56e6aadc1bbb79670") + + depends_on("python@3.7:", type=("build", "run")) + depends_on("py-setuptools", type="build") + depends_on("py-click@7:", type=("build", "run")) + depends_on("py-rich@10.7.0:", type=("build", "run")) + depends_on("py-importlib-metadata", type=("build", "run"), when="^python@:3.7") |