From 43a0cbe7a23e06e8f34bac5018c2f52db16dc663 Mon Sep 17 00:00:00 2001 From: danielsjensen1 Date: Fri, 31 Jan 2025 22:46:44 -0700 Subject: [PATCH] py-sphinx-rtd-theme: add v2.0.0, v3.0.0 (#48756) * Add versions 2 and 3 of py-sphinx-rtd-theme. Allow for versions of py-sphinx greater than 6. Fix the Python version for older versions that depend on distutils. Get the py-docutils dependency from the py-sphinx recipe. * Depend purely on the py-docutils dependency in py-sphinx. * More refined dependency versioning. * Fixed versioning for py-sphinx and py-docutils. --- .../packages/py-sphinx-rtd-theme/package.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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 e21ce8259e4..14ba952a829 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 @@ -13,6 +13,8 @@ class PySphinxRtdTheme(PythonPackage): license("MIT") + version("3.0.0", sha256="905d67de03217fd3d76fbbdd992034ac8e77044ef8063a544dda1af74d409e08") + version("2.0.0", sha256="bd5d7b80622406762073a04ef8fadc5f9151261563d47027de09910ce03afe6b") version("1.2.2", sha256="01c5c5a72e2d025bd23d1f06c59a4831b06e6ce6c01fdd5ebfe9986c0a880fc7") version("1.2.0", sha256="a0d8bd1a2ed52e0b338cbe19c4b2eef3c5e7a048769753dac6a9f059c7b641b8") version("1.0.0", sha256="eec6d497e4c2195fa0e8b2016b337532b8a699a68bcb22a512870e16925c6a5c") @@ -21,13 +23,20 @@ class PySphinxRtdTheme(PythonPackage): version("0.5.0", sha256="22c795ba2832a169ca301cd0a083f7a434e09c538c70beb42782c073651b707d") version("0.4.3", sha256="728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a") + depends_on("python@3.8:", when="@3:") + depends_on("python@3.6:", when="@:2") + depends_on("python@:3.11", when="@:1.0.0") # distutils was removed in python@3.12 depends_on("py-setuptools", type="build") - - depends_on("py-sphinx@1.6:6", when="@1:", type=("build", "run")) + depends_on("py-sphinx@6:8", when="@3:", type=("build", "run")) + depends_on("py-sphinx@5:7", when="@2", type=("build", "run")) + depends_on("py-sphinx@1.6:6", when="@1", type=("build", "run")) depends_on("py-sphinx@:6", when="@0", type=("build", "run")) - depends_on("py-docutils@:0.18", when="@1.2:", type=("build", "run")) + depends_on("py-docutils@0.19:0.21", when="@3:", type=("build", "run")) + depends_on("py-docutils@:0.20", when="@2", type=("build", "run")) + depends_on("py-docutils@:0.18", when="@1.2.0", 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="@2:", 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")