From 74d5da43a8156d2c4d349f373599e21439deefc0 Mon Sep 17 00:00:00 2001 From: Manuela Kuhn <36827019+manuelakuhn@users.noreply.github.com> Date: Sat, 15 Jul 2023 23:25:58 +0200 Subject: py-sphinx-rtd-theme: add 1.2.2 and py-sphinxcontrib-jquery: add 4.1 (#38896) --- .../repos/builtin/packages/py-sphinx-rtd-theme/package.py | 12 +++++++----- .../builtin/packages/py-sphinxcontrib-jquery/package.py | 7 +++++-- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py b/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py index 219417d23e..7f343f8add 100644 --- a/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx-rtd-theme/package.py @@ -12,6 +12,7 @@ class PySphinxRtdTheme(PythonPackage): homepage = "https://github.com/readthedocs/sphinx_rtd_theme" pypi = "sphinx-rtd-theme/sphinx_rtd_theme-0.5.1.tar.gz" + version("1.2.2", sha256="01c5c5a72e2d025bd23d1f06c59a4831b06e6ce6c01fdd5ebfe9986c0a880fc7") version("1.2.0", sha256="a0d8bd1a2ed52e0b338cbe19c4b2eef3c5e7a048769753dac6a9f059c7b641b8") version("1.0.0", sha256="eec6d497e4c2195fa0e8b2016b337532b8a699a68bcb22a512870e16925c6a5c") version("0.5.2", sha256="32bd3b5d13dc8186d7a42fc816a23d32e83a4827d7d9882948e7b837c232da5a") @@ -20,13 +21,14 @@ class PySphinxRtdTheme(PythonPackage): version("0.4.3", sha256="728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a") depends_on("py-setuptools", type="build") - depends_on("py-sphinx", when="@0.4.1:", type=("build", "run")) + depends_on("py-sphinx@1.6:6", when="@1:", type=("build", "run")) - depends_on("python@2.7:2.8,3.4:", when="@1:", type=("build", "run")) - depends_on("py-docutils@:0.16", when="@0.5.2:0", type=("build", "run")) - depends_on("py-docutils@:0.17", when="@1:1.1", type=("build", "run")) + depends_on("py-sphinx", when="@0.4.1:", type=("build", "run")) depends_on("py-docutils@:0.18", when="@1.2:", type=("build", "run")) - depends_on("py-sphinxcontrib-jquery@2:", when="@1.2:", type=("build", "run")) + depends_on("py-docutils@:0.17", when="@1:1.1", type=("build", "run")) + depends_on("py-docutils@:0.16", when="@0.5.2:0", type=("build", "run")) + depends_on("py-sphinxcontrib-jquery@4", when="@1.2.2:", type=("build", "run")) + depends_on("py-sphinxcontrib-jquery@2:", when="@1.2:1.2.1", type=("build", "run")) conflicts("^py-sphinxcontrib-jquery@3.0.0") def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-jquery/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-jquery/package.py index bb5637a3db..6a11a31998 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-jquery/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-jquery/package.py @@ -12,8 +12,11 @@ class PySphinxcontribJquery(PythonPackage): homepage = "https://github.com/sphinx-contrib/jquery" pypi = "sphinxcontrib-jquery/sphinxcontrib-jquery-2.0.0.tar.gz" + version("4.1", sha256="1620739f04e36a2c779f1a131a2dfd49b2fd07351bf1968ced074365933abc7a") version("2.0.0", sha256="8fb65f6dba84bf7bcd1aea1f02ab3955ac34611d838bcc95d4983b805b234daa") - depends_on("python@3.5:", when="@2:", type=("build", "run")) - depends_on("py-setuptools@65:", type=("build", "run")) depends_on("py-flit-core@3.7:", when="@3:", type="build") + depends_on("py-sphinx@1.8:", type=("build", "run")) + + # Historical dependencies + depends_on("py-setuptools@65:", when="@:3", type=("build", "run")) -- cgit v1.2.3-60-g2f50