Skip to content

Commit

Permalink
Merge branch 'spack-stack-dev' of https://github.com/jcsda/spack into…
Browse files Browse the repository at this point in the history
… feature/oneapi_support_neptune_env
  • Loading branch information
climbfuji committed Jun 11, 2024
2 parents 3518155 + 98ddab9 commit f3a6010
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion var/spack/repos/builtin/packages/py-metpy/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ class PyMetpy(PythonPackage):
depends_on("[email protected]:", type=("build", "run"))
depends_on("[email protected]:", type=("build", "run"))
depends_on("[email protected]:", type=("build", "run"))
depends_on("[email protected]:", type=("build", "run"))
# Unable to Find "pint.unit" -- Module Not Found Error with [email protected]:
depends_on("[email protected]:0.19", type=("build", "run"))
depends_on("[email protected]:", type=("build", "run"))
depends_on("[email protected]:", type=("build", "run"))
depends_on("[email protected]:", type=("build", "run"))
Expand Down
2 changes: 1 addition & 1 deletion var/spack/repos/builtin/packages/py-numexpr/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class PyNumexpr(PythonPackage):
depends_on("[email protected]:", when="@2.8.3:", type=("build", "run"))
depends_on("py-setuptools", type="build")

depends_on("[email protected]:", type=("build", "run"), when="@2.8.3:")
depends_on("[email protected]:1.25", type=("build", "run"), when="@2.8.3:")
# https://github.com/pydata/numexpr/issues/397
depends_on("[email protected]:1.22", type=("build", "run"), when="@:2.7")

Expand Down
1 change: 1 addition & 0 deletions var/spack/repos/builtin/packages/py-pint/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class PyPint(PythonPackage):
version("0.22", sha256="2d139f6abbcf3016cad7d3cec05707fe908ac4f99cf59aedfd6ee667b7a64433")
version("0.21.1", sha256="5d5b6b518d0c5a7ab03a776175db500f1ed1523ee75fb7fafe38af8149431c8d")
version("0.20.1", sha256="387cf04078dc7dfe4a708033baad54ab61d82ab06c4ee3d4922b1e45d5626067")
version("0.19.2", sha256="e1d4989ff510b378dad64f91711e7bdabe5ca78d75b06a18569ac454678c4baf")
version("0.18", sha256="8c4bce884c269051feb7abc69dbfd18403c0c764abc83da132e8a7222f8ba801")
version("0.17", sha256="f4d0caa713239e6847a7c6eefe2427358566451fe56497d533f21fb590a3f313")
version("0.11", sha256="308f1070500e102f83b6adfca6db53debfce2ffc5d3cbe3f6c367da359b5cf4d")
Expand Down
2 changes: 1 addition & 1 deletion var/spack/repos/builtin/packages/py-poetry/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class PyPoetry(PythonPackage):
depends_on("[email protected]:20.4.4,20.4.7:", when="@1.2", type=("build", "run"))
depends_on("[email protected]:20", when="@:1.1", type=("build", "run"))
depends_on("[email protected]", when="platform=darwin @1.6.1", type=("build", "run"))
depends_on("[email protected]:0.9", when="platform=darwin @1.2:")
depends_on("[email protected]:0.9", when="platform=darwin @1.2")
depends_on("[email protected]:1", when="@1.2")
depends_on("[email protected]:0.21", when="@1.6.1", type=("build", "run"))
depends_on("[email protected]:0.20", when="@1.2.1")
Expand Down

0 comments on commit f3a6010

Please sign in to comment.