py-sphinx: add v8.1.0 (#46907)

* py-sphinx: add v8.1.0

* py-sphinxcontrib-*help: add new versions

* blacken

5 files changed, 64 insertions, 17 deletions

diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py
index d1a65ac9da..911040046c 100644
--- a/var/spack/repos/builtin/packages/py-sphinx/package.py
+++ b/var/spack/repos/builtin/packages/py-sphinx/package.py
@@ -16,6 +16,7 @@ class PySphinx(PythonPackage):
 
     license("BSD-2-Clause")
 
+    version("8.1.0", sha256="109454425dbf4c78ecfdd481e56f078376d077edbda29804dba05c5161c8de06")
     version("8.0.2", sha256="0cce1ddcc4fd3532cf1dd283bc7d886758362c5c1de6598696579ce96d8ffa5b")
     version("8.0.1", sha256="7f762c18cfc1d4493e42f4a06a204c1ca55806c53f80a059e208e88d0668d661")
     version("8.0.0", sha256="22551dc8fda6038a422bf1de59d91b31837b66afe45a3f30b2d8cc5aa9337343")
@@ -107,15 +108,20 @@ class PySphinx(PythonPackage):
         depends_on("python@3.10:", when="@8:")
         depends_on("python@3.9:", when="@7.2:")
         depends_on("python@3.8:", when="@6:")
+        depends_on("py-sphinxcontrib-applehelp@1.0.7:", when="@8.1:")
         depends_on("py-sphinxcontrib-applehelp", when="@2:")
+        depends_on("py-sphinxcontrib-devhelp@1.0.6:", when="@8.1:")
         depends_on("py-sphinxcontrib-devhelp", when="@2:")
-        depends_on("py-sphinxcontrib-jsmath", when="@2:")
+        depends_on("py-sphinxcontrib-htmlhelp@2.0.6:", when="@8.1:")
         depends_on("py-sphinxcontrib-htmlhelp@2:", when="@4.1.1:")
         depends_on("py-sphinxcontrib-htmlhelp", when="@2:")
+        depends_on("py-sphinxcontrib-jsmath@1.0.1:", when="@8.1:")
+        depends_on("py-sphinxcontrib-jsmath", when="@2:")
+        depends_on("py-sphinxcontrib-qthelp@1.0.6:", when="@8.1:")
+        depends_on("py-sphinxcontrib-qthelp", when="@2:")
         depends_on("py-sphinxcontrib-serializinghtml@1.1.9:", when="@7.2.3:")
         depends_on("py-sphinxcontrib-serializinghtml@1.1.5:", when="@4.1.1:")
         depends_on("py-sphinxcontrib-serializinghtml", when="@2:")
-        depends_on("py-sphinxcontrib-qthelp", when="@2:")
         depends_on("py-jinja2@3.1:", when="@7.4:")
         depends_on("py-jinja2@3:", when="@5.2:")
         depends_on("py-jinja2@2.3:2", when="@:4.0.1")
@@ -140,8 +146,9 @@ class PySphinx(PythonPackage):
         depends_on("py-babel@2.13:", when="@7.4:")
         depends_on("py-babel@2.9:", when="@5.2:")
         depends_on("py-babel@1.3:")
-        depends_on("py-alabaster@0.7.14:0.7", when="@7.3:")
-        depends_on("py-alabaster@0.7")
+        depends_on("py-alabaster@0.7.14:", when="@8:")
+        depends_on("py-alabaster@0.7.14:0.7", when="@7.3:7.4")
+        depends_on("py-alabaster@0.7", when="@:7.2")
         depends_on("py-imagesize@1.3:", when="@5.2:")
         depends_on("py-imagesize", when="@1.4:")
         depends_on("py-requests@2.30:", when="@7.4:")
diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-applehelp/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-applehelp/package.py
index e84d9762ba..b7a5a518c6 100644
--- a/var/spack/repos/builtin/packages/py-sphinxcontrib-applehelp/package.py
+++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-applehelp/package.py
@@ -12,7 +12,7 @@ class PySphinxcontribApplehelp(PythonPackage):
     help books."""
 
     homepage = "http://sphinx-doc.org/"
-    pypi = "sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.tar.gz"
+    pypi = "sphinxcontrib-applehelp/sphinxcontrib_applehelp-2.0.0.tar.gz"
     git = "https://github.com/sphinx-doc/sphinxcontrib-applehelp.git"
 
     # 'sphinx' requires 'sphinxcontrib-applehelp' at build-time, but
@@ -22,10 +22,21 @@ class PySphinxcontribApplehelp(PythonPackage):
 
     license("BSD-2-Clause")
 
+    version("2.0.0", sha256="2f29ef331735ce958efa4734873f084941970894c6090408b079c61b2e1c06d1")
     version("1.0.4", sha256="828f867945bbe39817c210a1abfd1bc4895c8b73fcaade56d45357a348a07d7e")
     version("1.0.2", sha256="a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58")
     version("1.0.1", sha256="edaa0ab2b2bc74403149cb0209d6775c96de797dfd5b5e2a71981309efab3897")
 
-    depends_on("python@3.8:", when="@1.0.3:", type=("build", "run"))
-    depends_on("py-setuptools@64:", when="@1.0.4:", type="build")
-    depends_on("py-setuptools", type="build")
+    depends_on("py-flit-core@3.7:", when="@1.0.5:", type="build")
+    depends_on("py-setuptools@64:", when="@1.0.4", type="build")
+    depends_on("py-setuptools", when="@:1.0.3", type="build")
+
+    def url_for_version(self, version):
+        url = (
+            "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-applehelp/{}-{}.tar.gz"
+        )
+        if version >= Version("1.0.5"):
+            name = "sphinxcontrib_applehelp"
+        else:
+            name = "sphinxcontrib-applehelp"
+        return url.format(name, version)
diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-devhelp/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-devhelp/package.py
index 5821a4002b..40586bb8b8 100644
--- a/var/spack/repos/builtin/packages/py-sphinxcontrib-devhelp/package.py
+++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-devhelp/package.py
@@ -12,7 +12,7 @@ class PySphinxcontribDevhelp(PythonPackage):
     Devhelp document."""
 
     homepage = "http://sphinx-doc.org/"
-    pypi = "sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.tar.gz"
+    pypi = "sphinxcontrib-devhelp/sphinxcontrib_devhelp-2.0.0.tar.gz"
     git = "https://github.com/sphinx-doc/sphinxcontrib-devhelp.git"
 
     # 'sphinx' requires 'sphinxcontrib-devhelp' at build-time, but
@@ -22,8 +22,17 @@ class PySphinxcontribDevhelp(PythonPackage):
 
     license("BSD-2-Clause")
 
+    version("2.0.0", sha256="411f5d96d445d1d73bb5d52133377b4248ec79db5c793ce7dbe59e074b4dd1ad")
     version("1.0.2", sha256="ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4")
     version("1.0.1", sha256="6c64b077937330a9128a4da74586e8c2130262f014689b4b89e2d08ee7294a34")
 
-    depends_on("python@3.5:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
+    depends_on("py-flit-core@3.7:", when="@1.0.3:", type="build")
+    depends_on("py-setuptools", when="@:1.0.2", type="build")
+
+    def url_for_version(self, version):
+        url = "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-devhelp/{}-{}.tar.gz"
+        if version >= Version("1.0.3"):
+            name = "sphinxcontrib_devhelp"
+        else:
+            name = "sphinxcontrib-devhelp"
+        return url.format(name, version)
diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-htmlhelp/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-htmlhelp/package.py
index 036c046c82..82942bc32c 100644
--- a/var/spack/repos/builtin/packages/py-sphinxcontrib-htmlhelp/package.py
+++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-htmlhelp/package.py
@@ -12,7 +12,7 @@ class PySphinxcontribHtmlhelp(PythonPackage):
     document."""
 
     homepage = "http://sphinx-doc.org/"
-    pypi = "sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.tar.gz"
+    pypi = "sphinxcontrib-htmlhelp/sphinxcontrib_htmlhelp-2.1.0.tar.gz"
     git = "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp.git"
 
     # 'sphinx' requires 'sphinxcontrib-htmlhelp' at build-time, but
@@ -22,10 +22,21 @@ class PySphinxcontribHtmlhelp(PythonPackage):
 
     license("BSD-2-Clause")
 
+    version("2.1.0", sha256="c9e2916ace8aad64cc13a0d233ee22317f2b9025b9cf3295249fa985cc7082e9")
     version("2.0.1", sha256="0cbdd302815330058422b98a113195c9249825d681e18f11e8b1f78a2f11efff")
     version("2.0.0", sha256="f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2")
     version("1.0.2", sha256="4670f99f8951bd78cd4ad2ab962f798f5618b17675c35c5ac3b2132a14ea8422")
 
-    depends_on("python@3.8:", when="@2.0.1:", type=("build", "run"))
+    depends_on("py-flit-core@3.7:", when="@2.0.2:", type="build")
     depends_on("py-setuptools@64:", when="@2.0.1", type="build")
-    depends_on("py-setuptools", type="build")
+    depends_on("py-setuptools", when="@:2.0.0", type="build")
+
+    def url_for_version(self, version):
+        url = (
+            "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-htmlhelp/{}-{}.tar.gz"
+        )
+        if version >= Version("2.0.2"):
+            name = "sphinxcontrib_htmlhelp"
+        else:
+            name = "sphinxcontrib-htmlhelp"
+        return url.format(name, version)
diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-qthelp/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-qthelp/package.py
index d81e143c07..04aba1ae5c 100644
--- a/var/spack/repos/builtin/packages/py-sphinxcontrib-qthelp/package.py
+++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-qthelp/package.py
@@ -12,7 +12,7 @@ class PySphinxcontribQthelp(PythonPackage):
     document."""
 
     homepage = "http://sphinx-doc.org/"
-    pypi = "sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.tar.gz"
+    pypi = "sphinxcontrib-qthelp/sphinxcontrib_qthelp-2.0.0.tar.gz"
     git = "https://github.com/sphinx-doc/sphinxcontrib-qthelp.git"
 
     # 'sphinx' requires 'sphinxcontrib-qthelp' at build-time, but
@@ -22,8 +22,17 @@ class PySphinxcontribQthelp(PythonPackage):
 
     license("BSD-2-Clause")
 
+    version("2.0.0", sha256="4fe7d0ac8fc171045be623aba3e2a8f613f8682731f9153bb2e40ece16b9bbab")
     version("1.0.3", sha256="4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72")
     version("1.0.2", sha256="79465ce11ae5694ff165becda529a600c754f4bc459778778c7017374d4d406f")
 
-    depends_on("python@3.5:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
+    depends_on("py-flit-core@3.7:", when="@1.0.4:", type="build")
+    depends_on("py-setuptools", when="@:1.0.3", type="build")
+
+    def url_for_version(self, version):
+        url = "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-qthelp/{}-{}.tar.gz"
+        if version >= Version("1.0.4"):
+            name = "sphinxcontrib_qthelp"
+        else:
+            name = "sphinxcontrib-qthelp"
+        return url.format(name, version)