Add latest version of py-sphinx (#13293)

1 files changed, 33 insertions, 31 deletions

diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py
index aaf21e6eec..291b064b5d 100644
--- a/var/spack/repos/builtin/packages/py-sphinx/package.py
+++ b/var/spack/repos/builtin/packages/py-sphinx/package.py
@@ -8,8 +8,9 @@ from spack import *
 
 class PySphinx(PythonPackage):
     """Sphinx Documentation Generator."""
+
     homepage = "http://sphinx-doc.org"
-    url      = "https://pypi.io/packages/source/S/Sphinx/Sphinx-1.6.1.tar.gz"
+    url      = "https://pypi.io/packages/source/S/Sphinx/Sphinx-2.2.0.tar.gz"
 
     import_modules = [
         'sphinx', 'sphinx.testing', 'sphinx.ext', 'sphinx.pycode',
@@ -21,8 +22,9 @@ class PySphinx(PythonPackage):
         'sphinx.environment.collectors', 'sphinx.environment.adapters'
     ]
 
-    version('1.8.4',   sha256='c1c00fc4f6e8b101a0d037065043460dffc2d507257f2f11acaed71fd2b0c83c')
-    version('1.8.2',   sha256='120732cbddb1b2364471c3d9f8bfd4b0c5b550862f99a65736c77f970b142aea')
+    version('2.2.0', sha256='0d586b0f8c2fc3cc6559c5e8fd6124628110514fda0e5d7c82e682d749d2e845')
+    version('1.8.4', sha256='c1c00fc4f6e8b101a0d037065043460dffc2d507257f2f11acaed71fd2b0c83c')
+    version('1.8.2', sha256='120732cbddb1b2364471c3d9f8bfd4b0c5b550862f99a65736c77f970b142aea')
     version('1.7.4', sha256='e9b1a75a3eae05dded19c80eb17325be675e0698975baae976df603b6ed1eb10')
     version('1.6.3', sha256='af8bdb8c714552b77d01d4536e3d6d2879d6cb9d25423d29163d5788e27046e6')
     version('1.6.1', sha256='7581d82c3f206f0ac380edeeba890a2e2d2be011e5abe94684ceb0df4b6acc3f')
@@ -32,39 +34,39 @@ class PySphinx(PythonPackage):
 
     extends('python', ignore='bin/(pybabel|pygmentize)')
 
-    # 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
+    # See http://www.sphinx-doc.org/en/stable/changes.html for when each
+    # dependency was added or removed.
+    depends_on('python@3.5:', when='@2:', type=('build', 'run'))
+    depends_on('python@2.7:2.8,3.4:', when='@:1', type=('build', 'run'))
 
-    # 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'))
-
-    depends_on('py-six@1.5:',                 type=('build', 'run'))
-    depends_on('py-jinja2@2.3:',              type=('build', 'run'))
-    depends_on('py-pygments@2.0:',            type=('build', 'run'))
-    depends_on('py-docutils@0.11:',           type=('build', 'run'))
-    depends_on('py-snowballstemmer@1.1:',     type=('build', 'run'))
-    depends_on('py-babel@1.3:',               type=('build', 'run'))  # not 2.0
-    depends_on('py-alabaster@0.7.0:0.7.999',  type=('build', 'run'))
-    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
-    depends_on('py-sphinxcontrib-websupport', when='@1.6:',
-               type=('build', 'run'))
-    # Build dep for 1.6.1 all python (bug), see:
-    # https://github.com/sphinx-doc/sphinx/pull/3789
+    depends_on('py-sphinxcontrib-websupport', when='@1.6:1.999', type=('build', 'run'))
+    depends_on('py-sphinxcontrib-applehelp', when='@2:', type=('build', 'run'))
+    depends_on('py-sphinxcontrib-devhelp', when='@2:', type=('build', 'run'))
+    depends_on('py-sphinxcontrib-jsmath', when='@2:', type=('build', 'run'))
+    depends_on('py-sphinxcontrib-htmlhelp', when='@2:', type=('build', 'run'))
+    depends_on('py-sphinxcontrib-serializinghtml', when='@2:', type=('build', 'run'))
+    depends_on('py-sphinxcontrib-qthelp', when='@2:', type=('build', 'run'))
+    depends_on('py-six@1.5:', when='@:1', type=('build', 'run'))
+    depends_on('py-jinja2@2.3:', type=('build', 'run'))
+    depends_on('py-pygments@2.0:', type=('build', 'run'))
+    depends_on('py-docutils@0.12:', type=('build', 'run'))
+    depends_on('py-snowballstemmer@1.1:', type=('build', 'run'))
+    depends_on('py-babel@1.3:1.999,2.1:', type=('build', 'run'))
+    depends_on('py-alabaster@0.7.0:0.7.999', type=('build', 'run'))
+    depends_on('py-imagesize', when='@1.4:', type=('build', 'run'))
+    depends_on('py-requests@2.5.0:', type=('build', 'run'))
+    depends_on('py-setuptools', type=('build', 'run'))
+    depends_on('py-sphinx-rtd-theme@0.1:', when='@:1.3', type=('build', 'run'))
+    depends_on('py-packaging', when='@1.7.4:', type=('build', 'run'))
     depends_on('py-typing', when='@1.6.1', type=('build', 'run'))
     depends_on('py-typing', when='@1.6.2:^python@2.7:3.4', type=('build', 'run'))
 
     depends_on('py-pytest',     type='test')
-    depends_on('py-mock',       type='test')
-    depends_on('py-simplejson', type='test')
+    depends_on('py-pytest-cov', type='test')
     depends_on('py-html5lib',   type='test')
+    depends_on('py-flake8@3.5.0:', type='test')
+    depends_on('py-flake8-import-order', type='test')
+    depends_on('py-mypy@0.720:', type='test')
+    depends_on('py-docutils-stubs', type='test')