diff options
author | Miranda Mundt <55767766+mrmundt@users.noreply.github.com> | 2024-02-26 09:14:36 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-26 10:14:36 -0600 |
commit | 116308fa17ff365e8dcb2ca741988bc70694cd28 (patch) | |
tree | 6f03d0d4f3ed6f557c521f49fb6a4ad207c0491a | |
parent | 5eb4d858cbc806620aaed6e7e6bb8b8ce86ad46a (diff) | |
download | spack-116308fa17ff365e8dcb2ca741988bc70694cd28.tar.gz spack-116308fa17ff365e8dcb2ca741988bc70694cd28.tar.bz2 spack-116308fa17ff365e8dcb2ca741988bc70694cd28.tar.xz spack-116308fa17ff365e8dcb2ca741988bc70694cd28.zip |
py-pyomo: add v6.7.1 (#42795)
* Update Pyomo spack package for 6.7.1 release
* Apply changes from @adamjstewart
* Update sphinx+Pyomo versions
* Whoops - typo
-rw-r--r-- | var/spack/repos/builtin/packages/py-pyomo/package.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/py-pyomo/package.py b/var/spack/repos/builtin/packages/py-pyomo/package.py index 25a9de064c..a1c83b415d 100644 --- a/var/spack/repos/builtin/packages/py-pyomo/package.py +++ b/var/spack/repos/builtin/packages/py-pyomo/package.py @@ -15,9 +15,10 @@ class PyPyomo(PythonPackage): pypi = "Pyomo/Pyomo-5.6.6.tar.gz" git = "https://github.com/Pyomo/pyomo.git" - # Maintainer accurate as of 11/21/2023 + # Maintainer accurate as of 2024-02-21 maintainers("mrmundt") + version("6.7.1", sha256="735b66c45937f1caa43f073d8218a4918b6de658914a699397d38d5b8c219a40") version("6.7.0", sha256="a245ec609ef2fd907269f0b8e0923f74d5bf868b2ec0e62bf2a30b3f253bd17b") version("6.6.2", sha256="c8ad55213ff8b1a2c4e469110db8079722d5a6f364c6c46a42e2f750fc9e4d26") version("6.6.1", sha256="3fb0aba7b0f4120e6ce0f242502c0e61478d61e326bc90b7dc392bbefd114b34") @@ -51,6 +52,10 @@ class PyPyomo(PythonPackage): ) variant("optional", default=False, description="Install optional dependencies.", when="@6.1:") + ############################ + # UPDATE THESE AS REQUIRED + ############################ + # python_requires depends_on("python@3.8:3.12", when="@6.7:", type=("build", "run")) depends_on("python@3.7:3.11", when="@6.4:6.6", type=("build", "run")) @@ -80,18 +85,22 @@ class PyPyomo(PythonPackage): depends_on("py-pybind11", when="@6.1:+tests", type=("run")) # when docs is requested - depends_on("py-sphinx@4:", when="@6.1:+docs", type=("run")) + depends_on("py-sphinx@3:", when="@:6.6+docs", type=("run")) + depends_on("py-sphinx@5:", when="@6.7:+docs", type=("run")) depends_on("py-sphinx-copybutton", when="@6.1:+docs", type=("run")) - depends_on("py-sphinx-rtd-theme@0.5:", when="@6.1:+docs", type=("run")) + depends_on("py-sphinx-rtd-theme@0.6:", when="@6.1:+docs", type=("run")) depends_on("py-sphinxcontrib-jsmath", when="@6.1:+docs", type=("run")) depends_on("py-sphinxcontrib-napoleon", when="@6.1:+docs", type=("run")) + depends_on("py-sphinx-toolbox@2.16:", when="@6.7.1:+docs", type=("run")) + depends_on("py-sphinx-jinja2-compat@0.1.1:", when="@6.7.1:+docs", type=("run")) + depends_on("py-enum-tools", when="@6.7.1:+docs", type=("run")) depends_on("py-numpy", when="@6.1:+docs", type=("run")) depends_on("py-scipy", when="@6.4.2:+docs", type=("run")) # when optional is requested depends_on("py-dill", when="@6.1:+optional", type=("run")) depends_on("py-ipython", when="@6.1:+optional", type=("run")) - depends_on("py-matplotlib@3.6.2:", when="@6.1:+optional", type=("run")) + depends_on("py-matplotlib@:3.6.0,3.6.2:", when="@6.1:+optional", type=("run")) depends_on("py-networkx", when="@6.1:+optional", type=("run")) depends_on("py-numpy", when="@6.1:+optional", type=("run")) depends_on("py-openpyxl", when="@6.1:+optional", type=("run")) @@ -99,6 +108,7 @@ class PyPyomo(PythonPackage): depends_on("py-plotly", when="@6.6:+optional", type=("run")) depends_on("py-python-louvain", when="@6.1:+optional", type=("run")) depends_on("py-pyyaml", when="@6.1:+optional", type=("run")) + depends_on("py-qtconsole", when="@6.7.1:+optional", type=("run")) depends_on("py-scipy", when="@6.1:+optional", type=("run")) depends_on("py-sympy", when="@6.1:+optional", type=("run")) depends_on("py-xlrd", when="@6.1:+optional", type=("run")) |