mizani, plotnine, and pystan: added more versions and variable dependencies (#31541)

* py-panaroo: new package

* moving panaroo to branch

* updated mizani, plotnine, and pystan versions and requirements

* made suggested fixes

* adding more requested fixes

* added new versions of statsmodels and httpstan

4 files changed, 93 insertions, 36 deletions

diff --git a/var/spack/repos/builtin/packages/py-httpstan/package.py b/var/spack/repos/builtin/packages/py-httpstan/package.py
index 4c922fba4a..d7def8c53c 100644
--- a/var/spack/repos/builtin/packages/py-httpstan/package.py
+++ b/var/spack/repos/builtin/packages/py-httpstan/package.py
@@ -14,6 +14,7 @@ class PyHttpstan(PythonPackage):
 
     maintainers = ['haralmha']
 
+    version('4.8.0', sha256='cadfce05d24ec2af50d71c5212c648cbee5684a7f98fedd3838e124e5a9b4962')
     version('4.7.2', sha256='94f6631d969cbd91d136194b074d02642d8c9e2a05674877a39059be87c5bf7b')
     version('4.6.1', sha256='703e5e04e60651e0004574bb9695827d759fd13eb0d6bd67f827c1bfa0a1fd31')
 
diff --git a/var/spack/repos/builtin/packages/py-mizani/package.py b/var/spack/repos/builtin/packages/py-mizani/package.py
index 10bc4e0f4f..2a70870317 100644
--- a/var/spack/repos/builtin/packages/py-mizani/package.py
+++ b/var/spack/repos/builtin/packages/py-mizani/package.py
@@ -2,6 +2,8 @@
 # Spack Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
 from spack.package import *
 
 
@@ -9,16 +11,32 @@ class PyMizani(PythonPackage):
     """Mizani is a scales package for graphics. It is based on Hadley Wickham's
     Scales package."""
 
-    pypi = "mizani/mizani-0.7.3.tar.gz"
+    homepage = "https://mizani.readthedocs.io/en/latest"
+    pypi = "mizani/mizani-0.7.4.tar.gz"
 
-    version(
-        "0.7.3",
-        sha256="f521300bd29ca918fcd629bc8ab50fa04e41bdbe00f6bcf74055d3c6273770a4",
-    )
+    version('0.7.4', sha256='b84b923cd3b8b4c0421a750672e5a85ed2aa05e632bd37af8419d5bbf65c397c')
+    version('0.7.3', sha256='f521300bd29ca918fcd629bc8ab50fa04e41bdbe00f6bcf74055d3c6273770a4')
+    version('0.6.0', sha256='2cdba487ee54faf3e5bfe0903155a13ff13d27a2dae709f9432194915b4fb1cd')
 
-    depends_on('python@3.6:', type=('build', 'run'))
-    depends_on("py-matplotlib@3.1.1:", type=("build", "run"))
-    depends_on("py-numpy", type=("build", "run"))
+    # common requirements
     depends_on("py-palettable", type=("build", "run"))
-    depends_on("py-pandas@1.1.0:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
+
+    # variable requirements
+    depends_on('python@3.8:', type=('build', 'run'), when='@0.7.4:')
+    depends_on('python@3.6:', type=('build', 'run'), when='@0.6.0:')
+
+    depends_on("py-setuptools@42:", type="build", when='@0.7.4:')
+    depends_on("py-setuptools",     type="build", when='@0.6.0:')
+
+    depends_on("py-matplotlib@3.5.0:", type=("build", "run"), when='@0.7.4:')
+    depends_on("py-matplotlib@3.1.1:", type=("build", "run"), when='@0.6.0:')
+
+    depends_on("py-numpy@1.19.0:", type=("build", "run"), when='@0.7.4:')
+    depends_on("py-numpy",         type=("build", "run"), when='@0.6.0:')
+
+    depends_on("py-scipy@1.5.0:", type=("build", "run"), when='@0.7.4:')
+
+    depends_on("py-pandas@1.3.5:",  type=("build", "run"), when='@0.7.4:')
+    depends_on("py-pandas@1.1.0:",  type=("build", "run"), when='@0.7.2:')
+    depends_on("py-pandas@1.0.0:",  type=("build", "run"), when='@0.7.0:')
+    depends_on("py-pandas@0.25.0:", type=("build", "run"), when='@0.6.0:')
diff --git a/var/spack/repos/builtin/packages/py-plotnine/package.py b/var/spack/repos/builtin/packages/py-plotnine/package.py
index e864d62311..ee1338de04 100644
--- a/var/spack/repos/builtin/packages/py-plotnine/package.py
+++ b/var/spack/repos/builtin/packages/py-plotnine/package.py
@@ -2,6 +2,8 @@
 # Spack Project Developers. See the top-level COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
 from spack.package import *
 
 
@@ -10,20 +12,46 @@ class PyPlotnine(PythonPackage):
     based on ggplot2. The grammar allows users to compose plots by explicitly
     mapping data to the visual objects that make up the plot."""
 
-    pypi = "plotnine/plotnine-0.8.0.tar.gz"
-
-    version(
-        "0.8.0",
-        sha256="39de59edcc28106761b65238647d0b1f6212ea7f3a78f8be0b846616db969276",
-    )
-
-    depends_on('python@3.6:', type=('build', 'run'))
-    depends_on("py-descartes@1.1.0:", type=("build", "run"))
-    depends_on("py-matplotlib@3.1.1:", type=("build", "run"))
-    depends_on("py-mizani@0.7.3:", type=("build", "run"))
-    depends_on("py-numpy@1.19.0:", type=("build", "run"))
-    depends_on("py-pandas@1.1.0:", type=("build", "run"))
-    depends_on("py-patsy@0.5.1:", type=("build", "run"))
-    depends_on("py-scipy@1.5.0:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
-    depends_on("py-statsmodels@0.12.1:", type=("build", "run"))
+    homepage = "https://plotnine.readthedocs.io/en/stable"
+    pypi     = "plotnine/plotnine-0.8.0.tar.gz"
+
+    version('0.9.0', sha256='0e89a93015f3c71d6844ac7aa9fb0da09b908f5f7dfa7dd5d68a5ca32b2ebcea')
+    version('0.8.0', sha256='39de59edcc28106761b65238647d0b1f6212ea7f3a78f8be0b846616db969276')
+    version('0.7.1', sha256='02f2b0435dae2e917198c5367fd97b010445d64d9888c6b7e755d3cdfe7ad057')
+    version('0.7.0', sha256='8ee67cbf010ccea32670760e930b7b02177030a89ccdf85e35d156a96ce36cd3')
+    version('0.6.0', sha256='aae2c8164abb209ef4f28cab01132d23f6879fcf8d492657487359e1241459e5')
+
+    depends_on('python@3.8:',                 type=('build', 'run'), when='@0.9.0:')
+    depends_on('python@3.6:',                 type=('build', 'run'), when='@0.6.0:')
+
+    depends_on("py-setuptools@59:",           type="build", when='@0.9.0:')
+    depends_on("py-setuptools",               type="build", when='@0.6.0:')
+
+    depends_on("py-setuptools-scm@6.4:+toml", type="build", when='@0.9.0:')
+
+    depends_on("py-descartes@1.1.0:",         type=("build", "run"), when='@:0.8.0')
+
+    depends_on("py-matplotlib@3.5.0:",        type=("build", "run"), when='@0.9.0:')
+    depends_on("py-matplotlib@3.1.1:",        type=("build", "run"), when='@0.6.0:')
+
+    depends_on("py-mizani@0.7.3:",            type=("build", "run"), when='@0.8.0:')
+    depends_on("py-mizani@0.6.0:",            type=("build", "run"), when='@0.6.0:')
+
+    depends_on("py-numpy@1.19.0:",            type=("build", "run"), when='@0.8.0:')
+    depends_on("py-numpy@1.16.0:",            type=("build", "run"), when='@0.6.0:')
+
+    depends_on("py-pandas@1.3.5:",            type=("build", "run"), when='@0.9.0:')
+    depends_on("py-pandas@1.1.0:",            type=("build", "run"), when='@0.7.1:')
+    depends_on("py-pandas@1.0.3:",            type=("build", "run"), when='@0.7.0:')
+    depends_on("py-pandas@0.25.0:",           type=("build", "run"), when='@0.6.0:')
+
+    depends_on("py-patsy@0.5.1:",             type=("build", "run"), when='@0.7.0:')
+    depends_on("py-patsy@0.4.1:",             type=("build", "run"), when='@0.6.0:')
+
+    depends_on("py-scipy@1.5.0:",             type=("build", "run"), when='@0.8.0:')
+    depends_on("py-scipy@1.2.0:",             type=("build", "run"), when='@0.6.0:')
+
+    depends_on("py-statsmodels@0.13.2:",      type=("build", "run"), when='@0.9.0:')
+    depends_on("py-statsmodels@0.12.1:",      type=("build", "run"), when='@0.8.0:')
+    depends_on("py-statsmodels@0.11.1:",      type=("build", "run"), when='@0.7.0:')
+    depends_on("py-statsmodels@0.9.0:",       type=("build", "run"), when='@0.6.0:')
diff --git a/var/spack/repos/builtin/packages/py-pystan/package.py b/var/spack/repos/builtin/packages/py-pystan/package.py
index 7af6b917e3..2357dddc68 100644
--- a/var/spack/repos/builtin/packages/py-pystan/package.py
+++ b/var/spack/repos/builtin/packages/py-pystan/package.py
@@ -3,6 +3,7 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+
 from spack.package import *
 
 
@@ -14,13 +15,22 @@ class PyPystan(PythonPackage):
 
     maintainers = ['haralmha']
 
-    version('3.4.0', sha256='325e2fb0ab804555c05a603e0c9152ab11fcc3af01f3e9a9ff9fe9954b93184f')
+    version('3.5.0',    sha256='078571d071a5b7c0af59206d4994a0979f4ac4b61f4a720b640c44fe35514929')
+    version('3.4.0',    sha256='325e2fb0ab804555c05a603e0c9152ab11fcc3af01f3e9a9ff9fe9954b93184f')
+    version('2.19.1.1', sha256='fa8bad8dbc0da22bbe6f36af56c9abbfcf10f92df8ce627d59a36bd8d25eb038')
+    version('2.19.0.0', sha256='b85301b960d5991918b40bd64a4e9321813657a9fc028e0f39edce7220a309eb')
+
+    # common requirements
+    depends_on('py-setuptools',         type=('build', 'run'))
+    depends_on('py-poetry-core@1.0.0:', type=('build', 'run'))
 
-    depends_on('python@3.8:3', type=('build', 'run'))
-    depends_on('py-setuptools', type=('build', 'run'))
-    depends_on('py-poetry-core@1.0.0:', type='build')
-    depends_on('py-aiohttp@3.6:3', type=('build', 'run'))
-    depends_on('py-httpstan@4.7', type=('build', 'run'))
-    depends_on('py-pysimdjson@3.2:3', type=('build', 'run'))
-    depends_on('py-numpy@1.19:1', type=('build', 'run'))
-    depends_on('py-clikit@0.6', type=('build', 'run'))
+    # variable requirements
+    depends_on('python@3.8:3',                  type=('build', 'run'), when='@3.4.0:')
+    depends_on('py-aiohttp@3.6:3',              type=('build', 'run'), when='@3.4.0:')
+    depends_on('py-httpstan@4.8',               type=('build', 'run'), when='@3.5.0:')
+    depends_on('py-httpstan@4.7',               type=('build', 'run'), when='@3.4')
+    depends_on('py-pysimdjson@3.2:3',           type=('build', 'run'), when='@3.4.0:')
+    depends_on('py-numpy@1.19:1',               type=('build', 'run'), when='@3.4.0:')
+    depends_on('py-numpy@1.7:',                 type=('build', 'run'), when='@2.19.0.0:')
+    depends_on('py-clikit@0.6',                 type=('build', 'run'), when='@3.4.0:')
+    depends_on('py-cython@0.22:0.23.2,0.25.2:', type=('build', 'run'), when='@:2.19.1.1')