summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElizabeth Fischer <rpf2116@columbia.edu>2018-05-02 15:23:02 -0400
committerAdam J. Stewart <ajstewart426@gmail.com>2018-05-02 14:23:02 -0500
commitf054fa2f43951ef70b6ce223e8f9cf23064f11b9 (patch)
treecda076f0d0cc1301319d69a6b3534ffbb7db1b9f
parent73ded1a60cf1ee4062899b18229c821dc1b1f17f (diff)
downloadspack-f054fa2f43951ef70b6ce223e8f9cf23064f11b9.tar.gz
spack-f054fa2f43951ef70b6ce223e8f9cf23064f11b9.tar.bz2
spack-f054fa2f43951ef70b6ce223e8f9cf23064f11b9.tar.xz
spack-f054fa2f43951ef70b6ce223e8f9cf23064f11b9.zip
sphinx: Updated to v1.7.4 (#7977)
* sphinx: Updated to v1.7.4 * Update package.py
-rw-r--r--var/spack/repos/builtin/packages/py-sphinx/package.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py
index 801653b1a0..e4be436a7f 100644
--- a/var/spack/repos/builtin/packages/py-sphinx/package.py
+++ b/var/spack/repos/builtin/packages/py-sphinx/package.py
@@ -40,6 +40,7 @@ class PySphinx(PythonPackage):
'sphinx.environment.collectors', 'sphinx.environment.adapters'
]
+ version('1.7.4', '95f3b83f521314600e5b09e99cf32c46')
version('1.6.3', 'c5ad61f4e0974375ca2c2b58ef8d5411')
version('1.6.1', '26cb1cdca7aa4afc8c925d926b6268e7')
version('1.5.5', 'f9581b3556df9722143c47290273bcf8')
@@ -51,6 +52,9 @@ class PySphinx(PythonPackage):
# Sphinx requires at least Python 2.7 or 3.4 to run
depends_on('python@2.7:2.8,3.4:', type=('build', 'run'))
+ # See here for upstream list of dependencies:
+ # https://github.com/sphinx-doc/sphinx/blob/master/setup.py
+
# Most Python packages only require py-setuptools as a build dependency.
# However, py-sphinx requires py-setuptools during runtime as well.
depends_on('py-setuptools', type=('build', 'run'))
@@ -65,6 +69,8 @@ class PySphinx(PythonPackage):
depends_on('py-imagesize', when='@1.4:', type=('build', 'run'))
depends_on('py-requests@2.0.0:', type=('build', 'run'))
depends_on('py-sphinx-rtd-theme@0.1:', type=('build', 'run')) # optional as of 1.4
+ # See: https://github.com/sphinx-doc/sphinx/commit/854a227501a7582510eba41a208d25816f754e0c
+ depends_on('py-packaging', type=('build', 'run'), when='@1.7.4:')
# Sphinx v1.6+ no longer includes websupport by default:
# http://www.sphinx-doc.org/en/stable/changes.html