diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2023-08-24 20:30:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-24 18:30:13 -0700 |
| commit | b65f1f22ec89f1f7253bf45d7b77f53f5beb581d (patch) | |
| tree | c673c4f4a6e979847aa91891e42713c17eb956a2 | |
| parent | e9efa1df755e84172167d2a5d5a7a3ed154342e4 (diff) | |
| download | spack-b65f1f22ec89f1f7253bf45d7b77f53f5beb581d.tar.gz spack-b65f1f22ec89f1f7253bf45d7b77f53f5beb581d.tar.bz2 spack-b65f1f22ec89f1f7253bf45d7b77f53f5beb581d.tar.xz spack-b65f1f22ec89f1f7253bf45d7b77f53f5beb581d.zip | |
py-sphinx: add v7.2.3 (#39612)
| -rw-r--r-- | var/spack/repos/builtin/packages/py-sphinx/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-sphinxcontrib-serializinghtml/package.py | 21 |
2 files changed, 20 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/py-sphinx/package.py b/var/spack/repos/builtin/packages/py-sphinx/package.py index 0e5bf15100..9b0e1eb323 100644 --- a/var/spack/repos/builtin/packages/py-sphinx/package.py +++ b/var/spack/repos/builtin/packages/py-sphinx/package.py @@ -14,6 +14,7 @@ class PySphinx(PythonPackage): maintainers("adamjstewart") + version("7.2.3", sha256="ece68bb4d77b7dc090573825db45a6f9183e74098d1c21573485de250b1d1e3f") version("7.2.2", sha256="1c0abe6d4de7a6b2c2b109a2e18387bf27b240742e1b34ea42ac3ed2ac99978c") version("7.2.1", sha256="dad5e865dcdeb1486f70d8963cc9140561836bb243c311868cf11eb0f741497a") version("7.2.0", sha256="da9a84f7456885622bb30ebac42467168396ac2e494182c60dd864aa27405ba3") @@ -85,6 +86,7 @@ class PySphinx(PythonPackage): depends_on("py-sphinxcontrib-jsmath", when="@2:", type=("build", "run")) depends_on("py-sphinxcontrib-htmlhelp@2:", when="@4.1.1:", type=("build", "run")) depends_on("py-sphinxcontrib-htmlhelp", when="@2:", type=("build", "run")) + depends_on("py-sphinxcontrib-serializinghtml@1.1.9:", when="@7.2.3:", type=("build", "run")) depends_on("py-sphinxcontrib-serializinghtml@1.1.5:", when="@4.1.1:", type=("build", "run")) depends_on("py-sphinxcontrib-serializinghtml", when="@2:", type=("build", "run")) depends_on("py-sphinxcontrib-qthelp", when="@2:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sphinxcontrib-serializinghtml/package.py b/var/spack/repos/builtin/packages/py-sphinxcontrib-serializinghtml/package.py index d85fba1a1c..520470fb1d 100644 --- a/var/spack/repos/builtin/packages/py-sphinxcontrib-serializinghtml/package.py +++ b/var/spack/repos/builtin/packages/py-sphinxcontrib-serializinghtml/package.py @@ -12,15 +12,30 @@ class PySphinxcontribSerializinghtml(PythonPackage): "serialized" HTML files (json and pickle).""" homepage = "http://sphinx-doc.org/" - pypi = "sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.tar.gz" + pypi = "sphinxcontrib-serializinghtml/sphinxcontrib_serializinghtml-1.1.3.tar.gz" # 'sphinx' requires 'sphinxcontrib-serializinghtml' at build-time, but # 'sphinxcontrib-serializinghtml' requires 'sphinx' at run-time. Don't bother trying # to import any modules. import_modules: List[str] = [] + version("1.1.9", sha256="0c64ff898339e1fac29abd2bf5f11078f3ec413cfe9c046d3120d7ca65530b54") version("1.1.5", sha256="aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952") version("1.1.3", sha256="c0efb33f8052c04fd7a26c0a07f1678e8512e0faec19f4aa8f2473a8b81d5227") - depends_on("python@3.5:", type=("build", "run")) - depends_on("py-setuptools", type="build") + depends_on("python@3.9:", when="@1.1.6:", type=("build", "run")) + depends_on("py-flit-core@3.7:", when="@1.1.6:", type="build") + + # Circular dependency + # depends_on("py-sphinx@5:", when="@1.1.6:", type=("build", "run")) + + # Historical dependencies + depends_on("py-setuptools", when="@:1.1.5", type="build") + + def url_for_version(self, version): + url = "https://files.pythonhosted.org/packages/source/s/sphinxcontrib-serializinghtml/sphinxcontrib{}serializinghtml-{}.tar.gz" + if version >= Version("1.1.6"): + separator = "_" + else: + separator = "-" + return url.format(separator, version) |