summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2021-07-26 15:37:22 -0400
committerTodd Gamblin <tgamblin@llnl.gov>2021-07-26 13:46:27 -0700
commit520a465190efde5b4b80213d4ec0dfff4e6c3d72 (patch)
tree9688427381ef61514a871eb5a65944bda7a3570f
parentab39f548dc640cf6f9cd55af0b2c7f938a37cb44 (diff)
downloadspack-520a465190efde5b4b80213d4ec0dfff4e6c3d72.tar.gz
spack-520a465190efde5b4b80213d4ec0dfff4e6c3d72.tar.bz2
spack-520a465190efde5b4b80213d4ec0dfff4e6c3d72.tar.xz
spack-520a465190efde5b4b80213d4ec0dfff4e6c3d72.zip
Documentation does not build with Sphinx 4.1.2
-rw-r--r--lib/spack/docs/requirements.txt2
-rw-r--r--lib/spack/docs/spack.yaml12
-rw-r--r--lib/spack/spack/package.py2
3 files changed, 12 insertions, 4 deletions
diff --git a/lib/spack/docs/requirements.txt b/lib/spack/docs/requirements.txt
index 26787cfb1a..5eee3b8b5a 100644
--- a/lib/spack/docs/requirements.txt
+++ b/lib/spack/docs/requirements.txt
@@ -1,7 +1,7 @@
# These dependencies should be installed using pip in order
# to build the documentation.
-sphinx>=3.4
+sphinx>=3.4,!=4.1.2
sphinxcontrib-programoutput
sphinx-rtd-theme
python-levenshtein
diff --git a/lib/spack/docs/spack.yaml b/lib/spack/docs/spack.yaml
index 1ba1b61674..8f3fd53e8b 100644
--- a/lib/spack/docs/spack.yaml
+++ b/lib/spack/docs/spack.yaml
@@ -8,12 +8,20 @@
# these commands in this directory to install Sphinx and its plugins,
# then build the docs:
#
-# spack install
# spack env activate .
+# spack install
# make
#
spack:
specs:
- - "py-sphinx@3.4:"
+ # Sphinx
+ - "py-sphinx@3.4:4.1.1,4.1.3:"
- py-sphinxcontrib-programoutput
- py-sphinx-rtd-theme
+ # VCS
+ - git
+ - mercurial
+ - subversion
+ # Plotting
+ - graphviz
+ concretization: together
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index c60d4d03e4..2f63af1377 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -2657,7 +2657,7 @@ build_system_flags = PackageBase.build_system_flags
class BundlePackage(PackageBase):
- #"""General purpose bundle, or no-code, package class."""
+ """General purpose bundle, or no-code, package class."""
#: There are no phases by default but the property is required to support
#: post-install hooks (e.g., for module generation).
phases = [] # type: List[str]