Skip to content

Commit

Permalink
Merge pull request #516 from climbfuji/feature/update_pyarch_pyregion…
Browse files Browse the repository at this point in the history
…mask_spack_stack_dev

Update py-arch, py-statsmodels (add 0.14.1), py-patsy (add 0.5.4) to be able to use py-cython@3 (spack develop spack#48769)
  • Loading branch information
climbfuji authored Feb 10, 2025
2 parents a0a1f95 + bb8b392 commit 3c0df1a
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 8 deletions.
2 changes: 1 addition & 1 deletion var/spack/repos/builtin/packages/py-arch/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class PyArch(PythonPackage):
# "numpy>=2.0.0rc1,<3" ???
# https://github.com/bashtage/arch/blob/9ced09e2566c0ebcad962d2441b1e79e2aaa7c9f/requirements.txt#L1
# numpy>=1.22.3 ???
depends_on("py-numpy@1.22.3", type=("build", "run"))
depends_on("py-numpy@1.22.3:", type=("build", "run"))

depends_on("py-scipy@1.8:", type="run")
depends_on("py-pandas@1.4:", type="run")
Expand Down
3 changes: 3 additions & 0 deletions var/spack/repos/builtin/packages/py-patsy/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ class PyPatsy(PythonPackage):
homepage = "https://github.com/pydata/patsy"
pypi = "patsy/patsy-0.5.2.tar.gz"

maintainers("climbfuji")

license("PSF-2.0")

version("0.5.4", sha256="7dabc527597308de0e8f188faa20af7e06a89bdaa306756dfc7783693ea16af4")
version("0.5.3", sha256="bdc18001875e319bc91c812c1eb6a10be4bb13cb81eb763f466179dca3b67277")
version("0.5.2", sha256="5053de7804676aba62783dbb0f23a2b3d74e35e5bfa238b88b7cbf148a38b69d")
version("0.5.1", sha256="f115cec4201e1465cd58b9866b0b0e7b941caafec129869057405bfe5b5e3991")
Expand Down
24 changes: 17 additions & 7 deletions var/spack/repos/builtin/packages/py-statsmodels/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ class PyStatsmodels(PythonPackage):
pypi = "statsmodels/statsmodels-0.8.0.tar.gz"
git = "https://github.com/statsmodels/statsmodels.git"

maintainers("climbfuji")

license("BSD-3-Clause")

version("0.14.1", sha256="2260efdc1ef89f39c670a0bd8151b1d0843567781bcafec6cda0534eb47a94f6")
version("0.14.0", sha256="6875c7d689e966d948f15eb816ab5616f4928706b180cf470fd5907ab6f647a4")
version("0.13.5", sha256="593526acae1c0fda0ea6c48439f67c3943094c542fe769f8b90fe9e6c6cc4871")
version("0.13.2", sha256="77dc292c9939c036a476f1770f9d08976b05437daa229928da73231147cde7d4")
Expand All @@ -34,37 +37,44 @@ class PyStatsmodels(PythonPackage):
depends_on("python@3.8:", when="@0.14:", type=("build", "link", "run"))
depends_on("python", type=("build", "link", "run"))

depends_on("py-setuptools@69.0.2:", when="@0.14.1: ^python@3.12:", type="build")
depends_on("py-setuptools@63.4.3:", when="@0.14.1:", type="build")
depends_on("py-setuptools@59.2:", when="@0.13.3:", type="build")
depends_on("py-setuptools@0.6c5:", type="build")

# pyproject.toml
depends_on("py-cython@0.29.26:2", when="@0.14:", type="build")
depends_on("py-cython@0.29.33:3", when="@0.14.1", type="build")
depends_on("py-cython@0.29.26:2", when="@0.14.0", type="build")
depends_on("py-cython@0.29.32:2", when="@0.13.5:0.13", type="build")
depends_on("py-cython@0.29.22:2", when="@0.13:", type="build")
depends_on("py-cython@0.29.14:2", when="@0.12:", type="build")
depends_on("py-cython@0.29:2", type="build")
depends_on("py-setuptools-scm+toml@7.0", when="@0.13.3:", type="build")
depends_on("py-cython@0.29.22:2", when="@0.13:0.13.4", type="build")
depends_on("py-cython@0.29.14:2", when="@0.12", type="build")
depends_on("py-cython@0.29:2", when="@:0.11", type="build")
depends_on("py-setuptools-scm+toml@8", when="@0.14.1:", type="build")
depends_on("py-setuptools-scm+toml@7.0", when="@0.13.3:0.14.0", type="build")

# patsy@0.5.1 works around a Python change
# https://github.com/statsmodels/statsmodels/issues/5343 and
# https://github.com/pydata/patsy/pull/131

# requirements.txt
depends_on("py-numpy@1.18:", when="@0.14:", type=("build", "link", "run"))
depends_on("py-numpy@1.22.3:1", when="@0.14.1:", type=("build", "link", "run"))
depends_on("py-numpy@1.18:1", when="@0.14:", type=("build", "link", "run"))
depends_on("py-numpy@1.17:", when="@0.13:", type=("build", "link", "run"))
depends_on("py-numpy@1.15:", when="@0.12.1:", type=("build", "link", "run"))
depends_on("py-numpy@1.11:", when="@0.10.1:", type=("build", "link", "run"))
# https://github.com/statsmodels/statsmodels/issues/9194
depends_on("py-numpy@:1", when="@:0.14.1", type=("build", "link", "run"))
depends_on("py-scipy@1.4:", when="@0.13.5:", type=("build", "run"))
conflicts("^py-scipy@1.9.2")
conflicts("^py-scipy@1.9.2", when="@:0.14.1")
depends_on("py-scipy@1.3:", when="@0.13:", type=("build", "run"))
depends_on("py-scipy@1.2:", when="@0.12:", type=("build", "run"))
depends_on("py-scipy@0.18:", when="@0.10.1:", type=("build", "run"))
depends_on("py-pandas@1:", when="@0.14:", type=("build", "run"))
conflicts("^py-scipy@2.1.0", when="@:0.14.1")
depends_on("py-pandas@0.25:", when="@0.13:", type=("build", "run"))
depends_on("py-pandas@0.23:", when="@0.12:", type=("build", "run"))
depends_on("py-pandas@0.19:", when="@0.10.1:", type=("build", "run"))
depends_on("py-patsy@0.5.4:", when="@0.14.1:", type=("build", "run"))
depends_on("py-patsy@0.5.2:", when="@0.13:", type=("build", "run"))
depends_on("py-patsy@0.5.1:", when="@0.12:", type=("build", "run"))
depends_on("py-patsy@0.4:", when="@0.10.1:", type=("build", "run"))
Expand Down

0 comments on commit 3c0df1a

Please sign in to comment.