From 46419502cbae14bd9ef89be5d14776ac9c3b5f58 Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Tue, 27 Jun 2023 20:03:40 +0200 Subject: py-rich: add 13.4.2, py-markdown-it-py: add 3.0.0, py-mdurl: new (#38573) * py-rich: add 13.4.2, py-markdown-it-py: add 3.0.0, py-mdurl: add new package * Fix style --- .../builtin/packages/py-markdown-it-py/package.py | 15 ++++++++++---- .../repos/builtin/packages/py-mdurl/package.py | 18 ++++++++++++++++ .../repos/builtin/packages/py-rich/package.py | 24 ++++++++++++++-------- 3 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 var/spack/repos/builtin/packages/py-mdurl/package.py diff --git a/var/spack/repos/builtin/packages/py-markdown-it-py/package.py b/var/spack/repos/builtin/packages/py-markdown-it-py/package.py index d22162714a..11e0427007 100644 --- a/var/spack/repos/builtin/packages/py-markdown-it-py/package.py +++ b/var/spack/repos/builtin/packages/py-markdown-it-py/package.py @@ -15,9 +15,16 @@ class PyMarkdownItPy(PythonPackage): git = "https://github.com/executablebooks/markdown-it-py" pypi = "markdown-it-py/markdown-it-py-1.1.0.tar.gz" + version("3.0.0", sha256="e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb") version("1.1.0", sha256="36be6bb3ad987bfdb839f5ba78ddf094552ca38ccbd784ae4f74a4e1419fc6e3") - depends_on("python@3.6:3", type=("build", "run")) - depends_on("py-setuptools", type="build") - depends_on("py-attrs@19:21", type=("build", "run")) - depends_on("py-typing-extensions@3.7.4:", type=("build", "run"), when="^python@:3.7") + depends_on("python@3.8:", when="@2.1:", type=("build", "run")) + depends_on("python@3.6:3", when="@:2.0", type=("build", "run")) + depends_on("py-flit-core@3.4:3", when="@2.1:", type="build") + + depends_on("py-mdurl@0.1:0", when="@2:", type=("build", "run")) + + # Historical dependencies + depends_on("py-setuptools", when="@:2.0", type="build") + depends_on("py-attrs@19:21", when="@:2.0", type=("build", "run")) + depends_on("py-typing-extensions@3.7.4:", when="@:2 ^python@:3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-mdurl/package.py b/var/spack/repos/builtin/packages/py-mdurl/package.py new file mode 100644 index 0000000000..ad25526c4b --- /dev/null +++ b/var/spack/repos/builtin/packages/py-mdurl/package.py @@ -0,0 +1,18 @@ +# Copyright 2013-2023 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 PyMdurl(PythonPackage): + """Markdown URL utilities.""" + + homepage = "https://github.com/executablebooks/mdurl" + pypi = "mdurl/mdurl-0.1.2.tar.gz" + + version("0.1.2", sha256="bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba") + + depends_on("python@3.7:", type=("build", "run")) + depends_on("py-flit-core@3.2:3", type="build") diff --git a/var/spack/repos/builtin/packages/py-rich/package.py b/var/spack/repos/builtin/packages/py-rich/package.py index 21290bfcb2..1f7cb0a637 100644 --- a/var/spack/repos/builtin/packages/py-rich/package.py +++ b/var/spack/repos/builtin/packages/py-rich/package.py @@ -14,6 +14,7 @@ class PyRich(PythonPackage): homepage = "https://github.com/willmcgugan/rich" pypi = "rich/rich-9.4.0.tar.gz" + version("13.4.2", sha256="d653d6bccede5844304c605d5aac802c7cf9621efd700b46c7ec2b51ea914898") version("12.5.1", sha256="63a5c5ce3673d3d5fbbf23cd87e11ab84b6b451436f1b7f19ec54b6bc36ed7ca") version("10.14.0", sha256="8bfe4546d56b4131298d3a9e571a0742de342f1593770bd0d4707299f772a0af") version("10.9.0", sha256="ba285f1c519519490034284e6a9d2e6e3f16dc7690f2de3d9140737d81304d22") @@ -30,15 +31,20 @@ class PyRich(PythonPackage): version("9.5.0", sha256="a65a9d003cb6e87e6fa5d1b53bff6f43a8d7475524c58873acdbf5bba0683fa3") version("9.4.0", sha256="bde23a1761373fed2802502ff98292c5d735a5389ed96f4fe1be5fb4c2cde8ea") - depends_on("python@3.6:", type=("build", "run")) - depends_on("python@3.6.2:3", when="@10.14.0:", type=("build", "run")) - depends_on("python@3.6.3:3", when="@12.5.1:", type=("build", "run")) + depends_on("python@3.7:", when="@13:", type=("build", "run")) + depends_on("python@3.6.3:3", when="@12.2.1:12", type=("build", "run")) + depends_on("python@3.6.2:3", when="@10.14.0:12", type=("build", "run")) depends_on("py-poetry-core@1:", type="build") - depends_on("py-typing-extensions@4", when="@12.5.1: ^python@:3.8", type=("build", "run")) + + depends_on("py-typing-extensions@4", when="@12.2: ^python@:3.8", type=("build", "run")) depends_on( - "py-typing-extensions@3.7.4:4", when="@10.14.0: ^python@:3.7", type=("build", "run") + "py-typing-extensions@3.7.4:4", when="@10.14:12.1 ^python@:3.7", type=("build", "run") ) - depends_on("py-typing-extensions@3.7.4:3", when="@:10.13.0", type=("build", "run")) - depends_on("py-pygments@2.6:2", type=("build", "run")) - depends_on("py-commonmark@0.9.0:0.9", type=("build", "run")) - depends_on("py-colorama@0.4.0:0.4", type=("build", "run"), when="@:10.14.0") + depends_on("py-typing-extensions@3.7.4:3", when="@:10.13", type=("build", "run")) + depends_on("py-pygments@2.13:2", when="@13.3.2:", type=("build", "run")) + depends_on("py-pygments@2.6:2", when="@:13.2", type=("build", "run")) + depends_on("py-markdown-it-py@2.2:", when="@13.3.2:", type=("build", "run")) + + # Historical dependencies + depends_on("py-commonmark@0.9.0:0.9", when="@:13.1", type=("build", "run")) + depends_on("py-colorama@0.4.0:0.4", when="@:10.14.0", type=("build", "run")) -- cgit v1.2.3-70-g09d2