From 447ad2a3e360f7534a5d6fa1c5e96da61cd07dd0 Mon Sep 17 00:00:00 2001 From: MicK7 Date: Tue, 21 Feb 2023 20:53:21 +0100 Subject: Add new sphinx rtd theme release 1.2.0 (#35579) * Add new sphinx rtd theme release 1.2.0 The new release helps with supporting more recent version of docutils * set docutils officially supported version * add jquery dependency for sphinx-rtd-theme * add conflict with jquery version Co-authored-by: Adam J. Stewart * correct dependency * fix version dependency Co-authored-by: Adam J. Stewart * set sphinx version * fix sha256 * add version for flit-core Co-authored-by: Adam J. Stewart --------- Co-authored-by: Adam J. Stewart --- .../builtin/packages/py-sphinx-rtd-theme/package.py | 8 ++++++-- .../packages/py-sphinxcontrib-jquery/package.py | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 var/spack/repos/builtin/packages/py-sphinxcontrib-jquery/package.py 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 50b502ba17..219417d23e 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.0", sha256="a0d8bd1a2ed52e0b338cbe19c4b2eef3c5e7a048769753dac6a9f059c7b641b8") version("1.0.0", sha256="eec6d497e4c2195fa0e8b2016b337532b8a699a68bcb22a512870e16925c6a5c") version("0.5.2", sha256="32bd3b5d13dc8186d7a42fc816a23d32e83a4827d7d9882948e7b837c232da5a") version("0.5.1", sha256="eda689eda0c7301a80cf122dad28b1861e5605cbf455558f3775e1e8200e83a5") @@ -20,10 +21,13 @@ class PySphinxRtdTheme(PythonPackage): depends_on("py-setuptools", type="build") depends_on("py-sphinx", when="@0.4.1:", type=("build", "run")) - depends_on("py-sphinx@1.6:", when="@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:", type=("build", "run")) + depends_on("py-docutils@:0.17", when="@1:1.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")) + conflicts("^py-sphinxcontrib-jquery@3.0.0") def setup_build_environment(self, env): # Hack to prevent usage of npm in 0.5+ diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-jquery/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-jquery/package.py new file mode 100644 index 0000000000..bb5637a3db --- /dev/null +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-jquery/package.py @@ -0,0 +1,19 @@ +# 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 PySphinxcontribJquery(PythonPackage): + """A sphinx extension which ensure that jQuery is installed with Sphinx.""" + + homepage = "https://github.com/sphinx-contrib/jquery" + pypi = "sphinxcontrib-jquery/sphinxcontrib-jquery-2.0.0.tar.gz" + + 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") -- cgit v1.2.3-60-g2f50