py-sphinx: add v7.4 (#45255)

3 files changed, 38 insertions, 9 deletions

diff --git a/var/spack/repos/builtin/packages/py-babel/package.py b/var/spack/repos/builtin/packages/py-babel/package.py
index 1c73663fed..c1a56e434b 100644
--- a/var/spack/repos/builtin/packages/py-babel/package.py
+++ b/var/spack/repos/builtin/packages/py-babel/package.py
@@ -12,11 +12,12 @@ class PyBabel(PythonPackage):
     emphasis on web-based applications."""
 
     homepage = "https://babel.pocoo.org/en/latest/"
-    pypi = "Babel/Babel-2.7.0.tar.gz"
+    pypi = "Babel/babel-2.15.0.tar.gz"
     git = "https://github.com/python-babel/babel"
 
     license("BSD-3-Clause")
 
+    version("2.15.0", sha256="8daf0e265d05768bc6c7a314cf1321e9a123afc328cc635c18622a2f30a04413")
     version("2.12.1", sha256="cc2d99999cd01d44420ae725a21c9e3711b3aadc7976d6147f622d8581963455")
     version("2.10.3", sha256="7614553711ee97490f732126dc077f8d0ae084ebc6a96e23db1482afabdb2c51")
     version("2.9.1", sha256="bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0")
@@ -28,3 +29,10 @@ class PyBabel(PythonPackage):
     depends_on("py-setuptools", type=("build", "run"))
     depends_on("py-pytz@2015.7:", when="@2.12: ^python@:3.8", type=("build", "run"))
     depends_on("py-pytz@2015.7:", when="@:2.10", type=("build", "run"))
+
+    def url_for_version(self, version):
+        url = "https://files.pythonhosted.org/packages/source/B/Babel/{}-{}.tar.gz"
+        name = "Babel"
+        if version >= Version("2.15"):
+            name = name.lower()
+        return url.format(name, version)
diff --git a/var/spack/repos/builtin/packages/py-pygments/package.py b/var/spack/repos/builtin/packages/py-pygments/package.py
index d1afe8959a..c2837796e6 100644
--- a/var/spack/repos/builtin/packages/py-pygments/package.py
+++ b/var/spack/repos/builtin/packages/py-pygments/package.py
@@ -10,11 +10,12 @@ class PyPygments(PythonPackage):
     """Pygments is a syntax highlighting package written in Python."""
 
     homepage = "https://pygments.org/"
-    pypi = "Pygments/Pygments-2.4.2.tar.gz"
+    pypi = "Pygments/pygments-2.18.0.tar.gz"
     git = "https://github.com/pygments/pygments.git"
 
     license("BSD-2-Clause")
 
+    version("2.18.0", sha256="786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199")
     version("2.16.1", sha256="1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29")
     version("2.16.0", sha256="4f6df32f21dca07a54a0a130bda9a25d2241e9e0a206841d061c85a60cc96145")
     version("2.15.1", sha256="8ace4d3c1dd481894b2005f560ead0f9f19ee64fe983366be1a21e171d12775c")
@@ -29,10 +30,13 @@ class PyPygments(PythonPackage):
     version("2.0.1", sha256="5e039e1d40d232981ed58914b6d1ac2e453a7e83ddea22ef9f3eeadd01de45cb")
     version("2.0.2", sha256="7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51")
 
-    depends_on("c", type="build")  # generated
-    depends_on("cxx", type="build")  # generated
-    depends_on("fortran", type="build")  # generated
+    depends_on("py-hatchling", when="@2.17:", type="build")
+    depends_on("py-setuptools@61:", when="@2.15:2.16", type=("build", "run"))
+    depends_on("py-setuptools", when="@:2.14", type=("build", "run"))
 
-    depends_on("python@3.7:", when="@2.15:", type=("build", "run"))
-    depends_on("py-setuptools@61:", when="@2.15:", type=("build", "run"))
-    depends_on("py-setuptools", type=("build", "run"))
+    def url_for_version(self, version):
+        url = "https://files.pythonhosted.org/packages/source/P/Pygments/{}-{}.tar.gz"
+        name = "Pygments"
+        if version >= Version("2.17"):
+            name = name.lower()
+        return url.format(name, version)
diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py
index dfdb82fd75..450f56fa22 100644
--- a/var/spack/repos/builtin/packages/py-sphinx/package.py
+++ b/var/spack/repos/builtin/packages/py-sphinx/package.py
@@ -16,6 +16,14 @@ class PySphinx(PythonPackage):
 
     license("BSD-2-Clause")
 
+    version("7.4.5", sha256="a4abe5385bf856df094c1e6cadf24a2351b12057be3670b99a12c05a01d209f5")
+    version("7.4.4", sha256="43c911f997a4530b6cffd4ff8d5516591f6c60d178591f4406f0dd02282e3f64")
+    version("7.4.3", sha256="bd846bcb09fd2b6e94ce3e1ad50f4618bccf03cc7c17d0f3fa87393c0bd9178b")
+    version("7.4.2", sha256="946f1a6fa317b02f76deee78392ba712badc01cccd231b5995d933ae3365a151")
+    version("7.4.1", sha256="09539a16d74d1850b123cdd0752b9d24f3adc025ff887d611d1010348cd3648c")
+    version("7.4.0", sha256="8385520a28dc129ebf8b5fccfa1beb71215fd4455c6d10fa418e08c3c7a2ff9c")
+    version("7.3.7", sha256="a4a7db75ed37531c05002d56ed6948d4c42f473a36f46e1382b0bd76ca9627bc")
+    version("7.3.6", sha256="fc9f3d13fed5c9a0e677d368090e209899ce5d0081eb552b657e2923e57517f0")
     version("7.3.5", sha256="30d03bbaa53b77d38863fd6b95cc4edb4a84a1512787b3b0c12fb3b4fb25d9e9")
     version("7.3.4", sha256="614826a7cf76f0a4525875c3ed55e2c3618f906897cb7ad53511c5fedcbb35aa")
     version("7.3.3", sha256="1918ba7a7c52f88b5a41ab7e8c55828235994968cfaeb5d10532711e1264087f")
@@ -101,14 +109,17 @@ class PySphinx(PythonPackage):
         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")
         depends_on("py-jinja2@2.3:")
+        depends_on("py-pygments@2.17:", when="@7.4:")
         depends_on("py-pygments@2.14:", when="@7.2:")
         depends_on("py-pygments@2.13:", when="@6.0.1:")
         depends_on("py-pygments@2.12:", when="@5.2:")
         depends_on("py-pygments@2:")
-        depends_on("py-docutils@0.18.1:0.21", when="@7.3:")
+        depends_on("py-docutils@0.20:0.21", when="@7.4:")
+        depends_on("py-docutils@0.18.1:0.21", when="@7.3")
         depends_on("py-docutils@0.18.1:0.20", when="@7.0.1:7.2")
         depends_on("py-docutils@0.18.1:0.19", when="@6.2:7.0.0")
         depends_on("py-docutils@0.18:0.19", when="@6.0:6.1")
@@ -116,22 +127,28 @@ class PySphinx(PythonPackage):
         depends_on("py-docutils@0.14:0.18", when="@5.0")
         depends_on("py-docutils@0.14:0.17", when="@4")
         depends_on("py-docutils@0.12:0.16", when="@:3")
+        depends_on("py-snowballstemmer@2.2:", when="@7.4:")
         depends_on("py-snowballstemmer@2:", when="@5.2:")
         depends_on("py-snowballstemmer@1.1:")
+        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-imagesize@1.3:", when="@5.2:")
         depends_on("py-imagesize", when="@1.4:")
+        depends_on("py-requests@2.30:", when="@7.4:")
         depends_on("py-requests@2.25:", when="@6:")
         depends_on("py-requests@2.5:", when="@2:")
         depends_on("py-requests@2.4:", when="@1.5.2:")
+        depends_on("py-packaging@23:", when="@7.4:")
         depends_on("py-packaging@21:", when="@5.2:")
         depends_on("py-packaging", when="@1.7:")
+        depends_on("py-importlib-metadata@6:", when="@7.4: ^python@:3.9")
         depends_on("py-importlib-metadata@4.8:", when="@5.2: ^python@:3.9")
         depends_on("py-importlib-metadata@4.4:", when="@4.4: ^python@:3.9")
         depends_on("py-tomli@2:", when="@7.3.1: ^python@:3.10")
+        depends_on("py-colorama@0.4.6:", when="@7.4: platform=windows")
         depends_on("py-colorama@0.4.5:", when="@5.2: platform=windows")
         depends_on("py-colorama@0.3.5:", when="platform=windows")