hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

py-maestrowf: new version, fix artificial py-cryptography dep, support openssl 3 (#39946)

Browse source 
* py-maestrowf: add new version 1.1.9, deprecate development releases

* py-maestrowf: drop py-cryptography in 1.1.9

* py-maestrowf: drop py-cryptography dependency entirely, since it is not a direct dependency

* py-merlin: new version, ensure openssl 3 compat

* py-merlin: drop py-coloredlogs@10: lowerbound

* py-maestrowf: add py-rich, reorder deps

* py-celery: explain why upperbound is in spack but not in requirements.txt
This commit is contained in:
Harmen Stoppels 2023-09-13 07:30:52 +02:00 committed by GitHub
parent ed3f5fba1f
commit e45fc994aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
var/spack/repos/builtin/packages/py-maestrowf/package.py
View file

@ -21,18 +21,9 @@ class PyMaestrowf(PythonPackage):
version("develop", branch="develop")
version("master", branch="master")
# Development versions
version("1.1.9dev1", tag="1.1.9dev1", commit="097e6b842fd4a9540432a9dec1e41f0d1a2c2c2f")
# Pre-release candidates
version("1.1.7dev0", sha256="bcef838f13da396dd33cc7f503655de7a8f16ee5fe7b1e2a553044334a03f1f0")
# pypi releases
version(
"1.1.8",
sha256="fa8f8eb8dd3adfb9646d7b0dfd498a00423d2131adbc8dbc8016c4159b2ec1d5",
preferred=True,
)
version("1.1.9", sha256="92d964fee7c944a2b08bb6148cbab66d0b8a02893d281d395971368cc2ecf957")
version("1.1.8", sha256="fa8f8eb8dd3adfb9646d7b0dfd498a00423d2131adbc8dbc8016c4159b2ec1d5")
version("1.1.7", sha256="ff1b6696f30254b105fcadd297ad437c0c666ebc70124b231a713b89f47f4e94")
version("1.1.6", sha256="9812e67d9bd83c452cc99d82fbceb3017b5e36dafdf52eda939748bad4a88756")
version("1.1.4", sha256="6603b93494e8e9d939a4ab40ecdfe7923a85960a8a8bddea4734e230d8144016")
@ -42,15 +33,27 @@ class PyMaestrowf(PythonPackage):
version("1.1.0", sha256="1bfec546831f2ef577d7823bb50dcd12622644dad0d3d761998eafd0905b6977")
version("1.0.1", sha256="dd42ffeac1f0492a576c630b37e5d3593273e59664407f2ebf78d49322d37146")
version(
"1.1.9dev1",
tag="1.1.9dev1",
commit="097e6b842fd4a9540432a9dec1e41f0d1a2c2c2f",
deprecated=True,
)
version(
"1.1.7dev0",
sha256="bcef838f13da396dd33cc7f503655de7a8f16ee5fe7b1e2a553044334a03f1f0",
deprecated=True,
)
depends_on("python@2.7:2.8,3.5:", type=("build", "run"))
depends_on("python@3.6:", type=("build", "run"), when="@1.1.9:")
depends_on("py-setuptools", type=("build"), when="@:1.1.8")
depends_on("py-poetry@0.12:", type=("build"), when="@1.1.9:")
depends_on("py-cryptography@:2", type=("build"))
depends_on("py-pyyaml@4.2:", type=("build", "run"))
depends_on("py-six", type=("build", "run"))
depends_on("py-tabulate", type=("build", "run"), when="@1.1.0:")
depends_on("py-filelock", type=("build", "run"), when="@1.1.0:")
depends_on("py-poetry-core@1.0.8:", type=("build"), when="@1.1.9:")
depends_on("py-coloredlogs", type=("build", "run"), when="@1.1.7:")
depends_on("py-dill", type=("build", "run"), when="@1.1.7:")
depends_on("py-filelock", type=("build", "run"), when="@1.1.0:")
depends_on("py-jsonschema@3.2.0:", type=("build", "run"), when="@1.1.7:")
depends_on("py-pyyaml@4.2:", type=("build", "run"))
depends_on("py-rich", type=("build", "run"), when="@1.1.9:")
depends_on("py-six", type=("build", "run"))
depends_on("py-tabulate", type=("build", "run"), when="@1.1.0:")

18
var/spack/repos/builtin/packages/py-merlin/package.py
View file

@ -14,6 +14,7 @@ class PyMerlin(PythonPackage):
git = "https://github.com/LLNL/merlin.git"
tags = ["radiuss"]
version("1.10.3", sha256="6edaf17b502db090cef0bc53ae0118c55f77d7a16f43c7a235e0dd1770decadb")
version("1.7.5", sha256="1994c1770ec7fc9da216f9d0ca8214684dcc0daa5fd55337b96e308b2e68daaa")
version("1.7.4", sha256="9a6f8a84a1b52d0bfb0dc7bdbd7e15677e4a1041bd25a49a2d965efe503a6c20")
version("1.4.1", sha256="9d515cfdbcde2443892afd92b78dbc5bf2aed2060ed3a336e683188e015bca7c")
@ -23,14 +24,23 @@ class PyMerlin(PythonPackage):
depends_on("python@3.6:", type=("build", "run"))
depends_on("py-setuptools", type=("build", "run"))
depends_on("py-cached-property", type=("build", "run"))
depends_on("py-celery@5.0.0+redis+sqlalchemy", when="@1.7.5:", type=("build", "run"))
depends_on("py-celery@4.3.0:4+redis+sqlalchemy", when="@:1.7.4", type=("build", "run"))
depends_on("py-coloredlogs@10.0:", type=("build", "run"))
depends_on("py-celery@5.0.3:+redis+sqlalchemy", when="@1.7.6:", type=("build", "run"))
depends_on("py-celery@5.0.0:+redis+sqlalchemy", when="@1.7.5", type=("build", "run"))
depends_on("py-celery@4.4.5:+redis+sqlalchemy", when="@1.6.2:1.7.4", type=("build", "run"))
depends_on("py-celery@4.3.0:+redis+sqlalchemy", when="@:1.5.2", type=("build", "run"))
depends_on("py-celery@4.3.0:+redis", when="@1.4.1:1.5.1", type=("build", "run"))
# The upperbound on py-celery is not in requirements.txt because there was no 5.x release
# then. See commit 61b4fc708a3d6fd22709b35836065c778bf6304e for why it's needed.
depends_on("py-celery@:4", when="@:1.7.4", type=("build", "run"))
depends_on("py-coloredlogs", type=("build", "run"))
depends_on("py-cryptography", type=("build", "run"))
depends_on("py-maestrowf@1.1.7dev0", when="@1.2.0:", type=("build", "run"))
depends_on("py-importlib-metadata@:4", when="@1.10: ^python@3.7", type=("build", "run"))
depends_on("py-maestrowf@1.1.9:", when="@1.9.0:", type=("build", "run"))
depends_on("py-maestrowf@1.1.7dev0", when="@1.2.0:1.8", type=("build", "run"))
depends_on("py-maestrowf@1.1.6:", when="@:1.1", type=("build", "run"))
depends_on("py-numpy", type=("build", "run"))
depends_on("py-parse", type=("build", "run"))
depends_on("py-psutil@5.1.0:", type=("build", "run"))
depends_on("py-pyyaml@5.1.2:", type=("build", "run"))
depends_on("py-tabulate", type=("build", "run"))
depends_on("py-redis@4.3.4:", when="@1.9.0:", type=("build", "run"))