From 26bb15e1fb1fb820eeb1f7de232b317c311b3da3 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 17 Apr 2024 18:51:31 +0200 Subject: [PATCH] py-sphinx: add v7.3 (#43703) --- .../builtin/packages/py-alabaster/package.py | 5 +- .../builtin/packages/py-sphinx/package.py | 103 ++++++++++-------- 2 files changed, 61 insertions(+), 47 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-alabaster/package.py b/var/spack/repos/builtin/packages/py-alabaster/package.py index 44fc988f00..1c2c026136 100644 --- a/var/spack/repos/builtin/packages/py-alabaster/package.py +++ b/var/spack/repos/builtin/packages/py-alabaster/package.py @@ -14,9 +14,12 @@ class PyAlabaster(PythonPackage): pypi = "alabaster/alabaster-0.7.10.tar.gz" git = "https://github.com/sphinx-doc/alabaster.git" + version("0.7.16", sha256="75a8b99c28a5dad50dd7f8ccdd447a121ddb3892da9e53d1ca5cca3106d58d65") version("0.7.13", sha256="a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2") version("0.7.12", sha256="a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02") version("0.7.10", sha256="37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0") version("0.7.9", sha256="47afd43b08a4ecaa45e3496e139a193ce364571e7e10c6a87ca1a4c57eb7ea08") - depends_on("py-setuptools", type="build") + depends_on("python@3.9:", when="@0.7.16:", type=("build", "run")) + depends_on("py-flit-core@3.7:", when="@0.7.16:", type="build") + depends_on("py-setuptools", when="@:0.7.13", type="build") diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py index 2e5f84e0d4..dfdb82fd75 100644 --- a/var/spack/repos/builtin/packages/py-sphinx/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx/package.py @@ -16,6 +16,12 @@ class PySphinx(PythonPackage): license("BSD-2-Clause") + version("7.3.5", sha256="30d03bbaa53b77d38863fd6b95cc4edb4a84a1512787b3b0c12fb3b4fb25d9e9") + version("7.3.4", sha256="614826a7cf76f0a4525875c3ed55e2c3618f906897cb7ad53511c5fedcbb35aa") + version("7.3.3", sha256="1918ba7a7c52f88b5a41ab7e8c55828235994968cfaeb5d10532711e1264087f") + version("7.3.2", sha256="404a4610689936c2259711e9927174489bac500baa398f31f9ab641e42981e9d") + version("7.3.1", sha256="9d9e436f536620e13cea3becf107cd5b2fe65922c9fc24d1945543b6657f3468") + version("7.3.0", sha256="7ad02a0677d43cbaab3f9477355a412e449472d3f4693e2df3842e7ccb7ae7c8") version("7.2.6", sha256="9a5160e1ea90688d5963ba09a2dcd8bdd526620edbb65c328728f1b2228d5ab5") version("7.2.5", sha256="1a9290001b75c497fd087e92b0334f1bbfa1a1ae7fddc084990c4b7bd1130b88") version("7.2.4", sha256="1aeec862bf1edff4374012ac38082e0d1daa066c9e327841a846401164797988") @@ -83,55 +89,60 @@ class PySphinx(PythonPackage): depends_on("py-flit-core@3.7:", when="@5.2:", type="build") - depends_on("python@3.9:", when="@7.2:", type=("build", "run")) - depends_on("python@3.8:", when="@6:", type=("build", "run")) - - depends_on("py-sphinxcontrib-applehelp", when="@2:", type=("build", "run")) - depends_on("py-sphinxcontrib-devhelp", when="@2:", type=("build", "run")) - depends_on("py-sphinxcontrib-jsmath", when="@2:", type=("build", "run")) - depends_on("py-sphinxcontrib-htmlhelp@2:", when="@4.1.1:", type=("build", "run")) - depends_on("py-sphinxcontrib-htmlhelp", when="@2:", type=("build", "run")) - depends_on("py-sphinxcontrib-serializinghtml@1.1.9:", when="@7.2.3:", type=("build", "run")) - depends_on("py-sphinxcontrib-serializinghtml@1.1.5:", when="@4.1.1:", type=("build", "run")) - depends_on("py-sphinxcontrib-serializinghtml", when="@2:", type=("build", "run")) - depends_on("py-sphinxcontrib-qthelp", when="@2:", type=("build", "run")) - depends_on("py-jinja2@3:", when="@5.2:", type=("build", "run")) - depends_on("py-jinja2@2.3:2", when="@:4.0.1", type=("build", "run")) - depends_on("py-jinja2@2.3:", type=("build", "run")) - depends_on("py-pygments@2.14:", when="@7.2:", type=("build", "run")) - depends_on("py-pygments@2.13:", when="@6.0.1:", type=("build", "run")) - depends_on("py-pygments@2.12:", when="@5.2:", type=("build", "run")) - depends_on("py-pygments@2:", type=("build", "run")) - depends_on("py-docutils@0.18.1:0.20", when="@7.0.1:", type=("build", "run")) - depends_on("py-docutils@0.18.1:0.19", when="@6.2:7.0.0", type=("build", "run")) - depends_on("py-docutils@0.18:0.19", when="@6.0:6.1", type=("build", "run")) - depends_on("py-docutils@0.14:0.19", when="@5.1:5", type=("build", "run")) - depends_on("py-docutils@0.14:0.18", when="@5.0", type=("build", "run")) - depends_on("py-docutils@0.14:0.17", when="@4", type=("build", "run")) - depends_on("py-docutils@0.12:0.16", when="@:3", type=("build", "run")) - depends_on("py-snowballstemmer@2:", when="@5.2:", type=("build", "run")) - depends_on("py-snowballstemmer@1.1:", type=("build", "run")) - depends_on("py-babel@2.9:", when="@5.2:", type=("build", "run")) - depends_on("py-babel@1.3:", type=("build", "run")) - depends_on("py-alabaster@0.7", type=("build", "run")) - depends_on("py-imagesize@1.3:", when="@5.2:", type=("build", "run")) - depends_on("py-imagesize", when="@1.4:", type=("build", "run")) - depends_on("py-requests@2.25:", when="@6:", type=("build", "run")) - depends_on("py-requests@2.5:", when="@2:", type=("build", "run")) - depends_on("py-requests@2.4:", when="@1.5.2:", type=("build", "run")) - depends_on("py-packaging@21:", when="@5.2:", type=("build", "run")) - depends_on("py-packaging", when="@1.7:", type=("build", "run")) - depends_on("py-importlib-metadata@4.8:", when="@5.2: ^python@:3.9", type=("build", "run")) - depends_on("py-importlib-metadata@4.4:", when="@4.4: ^python@:3.9", type=("build", "run")) - depends_on("py-colorama@0.4.5:", when="@5.2: platform=windows", type=("build", "run")) - depends_on("py-colorama@0.3.5:", when="platform=windows", type=("build", "run")) + with default_args(type=("build", "run")): + depends_on("python@3.9:", when="@7.2:") + depends_on("python@3.8:", when="@6:") + depends_on("py-sphinxcontrib-applehelp", when="@2:") + depends_on("py-sphinxcontrib-devhelp", when="@2:") + depends_on("py-sphinxcontrib-jsmath", when="@2:") + depends_on("py-sphinxcontrib-htmlhelp@2:", when="@4.1.1:") + depends_on("py-sphinxcontrib-htmlhelp", when="@2:") + depends_on("py-sphinxcontrib-serializinghtml@1.1.9:", when="@7.2.3:") + depends_on("py-sphinxcontrib-serializinghtml@1.1.5:", when="@4.1.1:") + depends_on("py-sphinxcontrib-serializinghtml", when="@2:") + depends_on("py-sphinxcontrib-qthelp", when="@2:") + depends_on("py-jinja2@3:", when="@5.2:") + depends_on("py-jinja2@2.3:2", when="@:4.0.1") + depends_on("py-jinja2@2.3:") + depends_on("py-pygments@2.14:", when="@7.2:") + depends_on("py-pygments@2.13:", when="@6.0.1:") + depends_on("py-pygments@2.12:", when="@5.2:") + depends_on("py-pygments@2:") + depends_on("py-docutils@0.18.1:0.21", when="@7.3:") + depends_on("py-docutils@0.18.1:0.20", when="@7.0.1:7.2") + depends_on("py-docutils@0.18.1:0.19", when="@6.2:7.0.0") + depends_on("py-docutils@0.18:0.19", when="@6.0:6.1") + depends_on("py-docutils@0.14:0.19", when="@5.1:5") + depends_on("py-docutils@0.14:0.18", when="@5.0") + depends_on("py-docutils@0.14:0.17", when="@4") + depends_on("py-docutils@0.12:0.16", when="@:3") + depends_on("py-snowballstemmer@2:", when="@5.2:") + depends_on("py-snowballstemmer@1.1:") + depends_on("py-babel@2.9:", when="@5.2:") + depends_on("py-babel@1.3:") + depends_on("py-alabaster@0.7.14:0.7", when="@7.3:") + depends_on("py-alabaster@0.7") + depends_on("py-imagesize@1.3:", when="@5.2:") + depends_on("py-imagesize", when="@1.4:") + depends_on("py-requests@2.25:", when="@6:") + depends_on("py-requests@2.5:", when="@2:") + depends_on("py-requests@2.4:", when="@1.5.2:") + depends_on("py-packaging@21:", when="@5.2:") + depends_on("py-packaging", when="@1.7:") + depends_on("py-importlib-metadata@4.8:", when="@5.2: ^python@:3.9") + depends_on("py-importlib-metadata@4.4:", when="@4.4: ^python@:3.9") + depends_on("py-tomli@2:", when="@7.3.1: ^python@:3.10") + depends_on("py-colorama@0.4.5:", when="@5.2: platform=windows") + depends_on("py-colorama@0.3.5:", when="platform=windows") # Historical dependencies depends_on("py-setuptools", when="@4.4:5.1", type="build") - depends_on("py-setuptools", when="@:4.3", type=("build", "run")) - depends_on("py-sphinxcontrib-websupport", when="@1.6:1", type=("build", "run")) - depends_on("py-six@1.5:", when="@:1", type=("build", "run")) - depends_on("py-sphinx-rtd-theme@0.1:", when="@:1.3", type=("build", "run")) + + with default_args(type=("build", "run")): + depends_on("py-setuptools", when="@:4.3") + depends_on("py-sphinxcontrib-websupport", when="@1.6:1") + depends_on("py-six@1.5:", when="@:1") + depends_on("py-sphinx-rtd-theme@0.1:", when="@:1.3") def url_for_version(self, version): url = "https://files.pythonhosted.org/packages/source/S/Sphinx/{}-{}.tar.gz"