diff options
52 files changed, 92 insertions, 1703 deletions
diff --git a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py index c5f617120a..59b642359b 100644 --- a/var/spack/repos/builtin/packages/fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/fenics-dolfinx/package.py @@ -19,21 +19,6 @@ class FenicsDolfinx(CMakePackage): version("0.5.1", sha256="a570e3f6ed8e7c570e7e61d0e6fd44fa9dad2c5f8f1f48a6dc9ad22bacfbc973") version("0.5.0", sha256="503c70c01a44d1ffe48e052ca987693a49f8d201877652cabbe2a44eb3b7c040") version("0.4.1", sha256="68dcf29a26c750fcea5e02d8d58411e3b054313c3bf6fcbc1d0f08dd2851117f") - version( - "0.3.0", - sha256="4857d0fcb44a4e9bf9eb298ba5377abdee17a7ad0327448bdd06cce73d109bed", - deprecated=True, - ) - version( - "0.2.0", - sha256="e6462fc3b9653d335c28096f9b0393f966c55a64c77ed64cc6c949406cb1f2c3", - deprecated=True, - ) - version( - "0.1.0", - sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33", - deprecated=True, - ) conflicts( "%gcc@:9.10", @@ -53,22 +38,14 @@ class FenicsDolfinx(CMakePackage): default=("parmetis",), values=("kahip", "parmetis", "scotch"), multi=True, - when="@0.4.0:", ) - variant("kahip", default=False, when="@0.1.0:0.3.0", description="kahip support") - variant("parmetis", default=False, when="@0.1.0:0.3.0", description="parmetis support") - # Graph partitioner dependencies for @0.4.0: + # Graph partitioner dependencies depends_on("kahip@3.12:", when="partitioners=kahip @0.5.0:") depends_on("kahip@3.11", when="partitioners=kahip @:0.4.1") depends_on("parmetis", when="partitioners=parmetis") depends_on("scotch+mpi", when="partitioners=scotch") - # Graph partitioner dependencies for "@0.1.0:0.3.0" - depends_on("kahip", when="+kahip") - depends_on("parmetis", when="+parmetis") - depends_on("scotch+mpi", when="@0.1.0:0.3.0") - variant("slepc", default=False, description="slepc support") variant("adios2", default=False, description="adios2 support") @@ -79,7 +56,6 @@ class FenicsDolfinx(CMakePackage): depends_on("boost@1.7.0:+filesystem+program_options+timer") depends_on("petsc+mpi+shared") - depends_on("petsc+mpi+shared@3.15.0:", when="@0.1.0") depends_on("xtensor@0.23.10:", when="@:0.5") depends_on("xtl@0.7.2:", when="@:0.5") @@ -92,18 +68,11 @@ class FenicsDolfinx(CMakePackage): depends_on("fenics-ufcx@0.6.0:0.6", when="@0.6.0:0.6") depends_on("fenics-ufcx@0.5.0", when="@0.5.1:0.5") depends_on("fenics-ufcx@0.4.2", when="@0.4.1") - depends_on("py-fenics-ffcx@0.3.0", type=("build", "run"), when="@0.3.0") - depends_on("py-fenics-ffcx@0.3.0", type=("build", "run"), when="@0.3.0") - depends_on("py-fenics-ffcx@0.2.0", type=("build", "run"), when="@0.2.0") - depends_on("py-fenics-ffcx@0.1.0", type=("build", "run"), when="@0.1.0") depends_on("fenics-basix@main", when="@main") depends_on("fenics-basix@0.6.0:0.6", when="@0.6.0:0.6") depends_on("fenics-basix@0.5.1:0.5", when="@0.5.0:0.5") depends_on("fenics-basix@0.4.2", when="@0.4.1") - depends_on("fenics-basix@0.3.0", when="@0.3.0") - depends_on("fenics-basix@0.2.0", when="@0.2.0") - depends_on("fenics-basix@0.1.0", when="@0.1.0") conflicts( "%gcc@:9.10", @@ -120,24 +89,12 @@ class FenicsDolfinx(CMakePackage): root_cmakelists_dir = "cpp" def cmake_args(self): - args = [ + return [ self.define("DOLFINX_SKIP_BUILD_TESTS", True), self.define_from_variant("DOLFINX_ENABLE_SLEPC", "slepc"), self.define_from_variant("DOLFINX_ENABLE_ADIOS2", "adios2"), + self.define("DOLFINX_UFCX_PYTHON", False), + self.define("DOLFINX_ENABLE_KAHIP", "partitioners=kahip" in self.spec), + self.define("DOLFINX_ENABLE_PARMETIS", "partitioners=parmetis" in self.spec), + self.define("DOLFINX_ENABLE_SCOTCH", "partitioners=scotch" in self.spec), ] - - if self.spec.satisfies("@0.4.0:"): - args += [ - self.define("DOLFINX_UFCX_PYTHON", False), - self.define("DOLFINX_ENABLE_KAHIP", "partitioners=kahip" in self.spec), - self.define("DOLFINX_ENABLE_PARMETIS", "partitioners=parmetis" in self.spec), - self.define("DOLFINX_ENABLE_SCOTCH", "partitioners=scotch" in self.spec), - ] - - if self.spec.satisfies("@:0.3.0"): - args.append(self.define_from_variant("DOLFINX_ENABLE_KAHIP", "kahip")) - args.append(self.define_from_variant("DOLFINX_ENABLE_PARMETIS", "parmetis")) - args.append(self.define("Python3_ROOT_DIR", self.spec["python"].home)) - args.append(self.define("Python3_FIND_STRATEGY", "LOCATION")) - - return args diff --git a/var/spack/repos/builtin/packages/httpie/package.py b/var/spack/repos/builtin/packages/httpie/package.py index 1df2953672..f64ab12b07 100644 --- a/var/spack/repos/builtin/packages/httpie/package.py +++ b/var/spack/repos/builtin/packages/httpie/package.py @@ -16,25 +16,15 @@ class Httpie(PythonPackage): version("3.2.1", sha256="c9c0032ca3a8d62492b7231b2dd83d94becf3b71baf8a4bbcd9ed1038537e3ec") version("2.6.0", sha256="ef929317b239bbf0a5bb7159b4c5d2edbfc55f8a0bcf9cd24ce597daec2afca5") version("2.5.0", sha256="fe6a8bc50fb0635a84ebe1296a732e39357c3e1354541bf51a7057b4877e47f9") - version( - "0.9.9", - sha256="f1202e6fa60367e2265284a53f35bfa5917119592c2ab08277efc7fffd744fcb", - deprecated=True, - ) - version( - "0.9.8", - sha256="515870b15231530f56fe2164190581748e8799b66ef0fe36ec9da3396f0df6e1", - deprecated=True, - ) - depends_on("python@3.6:", when="@2.5:", type=("build", "run")) + depends_on("python@3.6:", type=("build", "run")) depends_on("py-charset-normalizer@2:", when="@2.6:", type=("build", "run")) - depends_on("py-defusedxml@0.6:", when="@2.5:", type=("build", "run")) + depends_on("py-defusedxml@0.6:", type=("build", "run")) depends_on("py-requests@2.11:", type=("build", "run")) - depends_on("py-requests@2.22:+socks", when="@2.5:", type=("build", "run")) + depends_on("py-requests@2.22:+socks", type=("build", "run")) depends_on("py-pygments@2.1.3:", type=("build", "run")) - depends_on("py-pygments@2.5.2:", when="@2.5:", type=("build", "run")) - depends_on("py-requests-toolbelt@0.9.1:", when="@2.5:", type=("build", "run")) + depends_on("py-pygments@2.5.2:", type=("build", "run")) + depends_on("py-requests-toolbelt@0.9.1:", type=("build", "run")) depends_on("py-multidict@4.7.0:", when="@3.2.1:", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) depends_on("py-importlib-metadata@1.4.0:", when="@3: ^python@:3.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/mxnet/package.py b/var/spack/repos/builtin/packages/mxnet/package.py index e926f4ffa2..d8639dca2a 100644 --- a/var/spack/repos/builtin/packages/mxnet/package.py +++ b/var/spack/repos/builtin/packages/mxnet/package.py @@ -17,7 +17,6 @@ class Mxnet(CMakePackage, CudaPackage, PythonExtension): maintainers("adamjstewart") version("master", branch="master", submodules=True) - version("1.master", branch="v1.x", submodules=True, deprecated=True) version("1.9.1", sha256="11ea61328174d8c29b96f341977e03deb0bf4b0c37ace658f93e38d9eb8c9322") version("1.9.0", sha256="a2a99cf604d57094269cacdfc4066492b2dc886593ee02b862e034f6180f712d") version("1.8.0", sha256="95aff985895aba409c08d5514510ae38b88490cfb6281ab3a5ff0f5826c8db54") @@ -67,7 +66,7 @@ class Mxnet(CMakePackage, CudaPackage, PythonExtension): conflicts("+nccl", when="~cuda") conflicts("platform=darwin target=aarch64:", when="@:1") - patch("openblas-1.7.0.patch", when="@1.7.0:1.master") + patch("openblas-1.7.0.patch", when="@1.7.0:1") patch("openblas-1.6.0.patch", when="@1.6.0") patch("cmake_cuda_flags.patch", when="@1.6:1.7") patch("parallell_shuffle.patch", when="@1.6.0") diff --git a/var/spack/repos/builtin/packages/nccl/package.py b/var/spack/repos/builtin/packages/nccl/package.py index 1573b8dcd2..95f0fad11f 100644 --- a/var/spack/repos/builtin/packages/nccl/package.py +++ b/var/spack/repos/builtin/packages/nccl/package.py @@ -46,20 +46,10 @@ class Nccl(MakefilePackage, CudaPackage): version("2.4.2-1", sha256="e3dd04b22eb541394bd818e5f78ac23a09cc549690d5d55d6fccc1a36155385a") version("2.3.7-1", sha256="e6eff80d9d2db13c61f8452e1400ca2f098d2dfe42857cb23413ce081c5b9e9b") version("2.3.5-5", sha256="bac9950b4d3980c25baa8e3e4541d2dfb4d21edf32ad3b89022d04920357142f") - version( - "1.3.4-1", - sha256="11e4eb44555bb28b9cbad973dacb4640b82710c9769e719afc2013b63ffaf884", - deprecated=True, - ) - version( - "1.3.0-1", - sha256="53f36151061907bdcafad1c26c1d9370a0a8400f561a83704a5138213ba51003", - deprecated=True, - ) variant("cuda", default=True, description="Build with CUDA") - depends_on("rdma-core", when="@2.3.5-5:") + depends_on("rdma-core") # https://github.com/NVIDIA/nccl/issues/244 patch("so_reuseport.patch", when="@2.3.7-1:2.4.8-1") diff --git a/var/spack/repos/builtin/packages/py-adios/package.py b/var/spack/repos/builtin/packages/py-adios/package.py index cf1b9b0786..5cc3eee27e 100644 --- a/var/spack/repos/builtin/packages/py-adios/package.py +++ b/var/spack/repos/builtin/packages/py-adios/package.py @@ -19,40 +19,10 @@ class PyAdios(PythonPackage): version("develop", branch="master") version("1.13.1", sha256="b1c6949918f5e69f701cabfe5987c0b286793f1057d4690f04747852544e157b") - version( - "1.13.0", - sha256="7b5ee8ff7a5f7215f157c484b20adb277ec0250f87510513edcc25d2c4739f50", - deprecated=True, - ) - version( - "1.12.0", - sha256="22bc22c157322abec2d1a0817a259efd9057f88c2113e67d918a9a5ebcb3d88d", - deprecated=True, - ) - version( - "1.11.1", - sha256="9f5c10b9471a721ba57d1cf6e5a55a7ad139a6c12da87b4dc128539e9eef370e", - deprecated=True, - ) - version( - "1.11.0", - sha256="e89d14ccbe7181777225e0ba6c272c0941539b8ccd440e72ed5a9457441dae83", - deprecated=True, - ) - version( - "1.10.0", - sha256="6713069259ee7bfd4d03f47640bf841874e9114bab24e7b0c58e310c42a0ec48", - deprecated=True, - ) - version( - "1.9.0", - sha256="23b2bb70540d51ab0855af0b205ca484fd1bd963c39580c29e3133f9e6fffd46", - deprecated=True, - ) variant("mpi", default=True, description="Enable MPI support") - for v in ["1.9.0", "1.10.0", "1.11.0", "1.11.1", "1.12.0", "1.13.0", "1.13.1", "develop"]: + for v in ["1.13.1", "develop"]: depends_on( "adios@{0} ~mpi".format(v), when="@{0} ~mpi".format(v), type=["build", "link", "run"] ) diff --git a/var/spack/repos/builtin/packages/py-archspec/package.py b/var/spack/repos/builtin/packages/py-archspec/package.py index af37cc28ad..047beda9af 100644 --- a/var/spack/repos/builtin/packages/py-archspec/package.py +++ b/var/spack/repos/builtin/packages/py-archspec/package.py @@ -17,41 +17,6 @@ class PyArchspec(PythonPackage): version("0.2.1", sha256="0974a8a95831d2d43cce906c5b79a35d5fd2bf9be478b0e3b7d83ccc51ac815e") version("0.2.0", sha256="6aaba5ebdb5c3633c400d8c221a6a18716da0c64b367a8509f4217b22e91a5f5") - version( - "0.1.3", - sha256="a1aa7abde4d4ce38d115dfd572584906fa8e192e3272b8897e7b4fa1213ec27c", - deprecated=True, - ) - version( - "0.1.2", - sha256="8bb998370f0dc3e509d57c13724ab4109d761fd74af20da26fbe513b0fe01c46", - deprecated=True, - ) - version( - "0.1.1", - sha256="34bafad493b41208857232e21776216d716de37ab051a6a4a1cc1653f7e26423", - deprecated=True, - ) - version( - "0.1.0", - sha256="a4431d0bbe9c9dd7b293c39d8e7590034d512ce5f5a1278a6cbdf61b33f7202d", - deprecated=True, - ) - with when("@0.1"): - depends_on("python@2.7:2.8,3.5:", type=("build", "run")) - depends_on("py-click@7.1.2:7", type=("build", "run")) - depends_on("py-six@1.13.0:1", type=("build", "run")) - - with when("@0.2.0"): - depends_on("py-click@8", type=("build", "run")) - - depends_on("python@3.6:", when="@0.2:", type=("build", "run")) depends_on("py-poetry-core@1.0.0:", type="build") - - def patch(self): - # See https://python-poetry.org/docs/pyproject/#poetry-and-pep-517 - if self.spec.satisfies("@:0.1.3"): - with working_dir(self.stage.source_path): - filter_file("poetry>=0.12", "poetry_core>=1.0.0", "pyproject.toml") - filter_file("poetry.masonry.api", "poetry.core.masonry.api", "pyproject.toml") + depends_on("py-click@8", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-autopep8/package.py b/var/spack/repos/builtin/packages/py-autopep8/package.py index 051abd8965..521d7472fa 100644 --- a/var/spack/repos/builtin/packages/py-autopep8/package.py +++ b/var/spack/repos/builtin/packages/py-autopep8/package.py @@ -18,12 +18,7 @@ class PyAutopep8(PythonPackage): version("1.5.7", sha256="276ced7e9e3cb22e5d7c14748384a5cf5d9002257c0ed50c0e075b68011bb6d0") version("1.4.4", sha256="4d8eec30cc81bc5617dbf1218201d770dc35629363547f17577c61683ccfb3ee") version("1.3.3", sha256="ff787bffb812818c3071784b5ce9a35f8c481a0de7ea0ce4f8b68b8788a12f30") - version("1.2.4", sha256="38e31e266e29808e8a65a307778ed8e402e1f0d87472009420d6d18146cdeaa2") - version("1.2.2", sha256="ecc51614755c7f697e83478f87eb6bbd009075a397c15080f0311aaecbbdfca8") - depends_on("python@2.6:2.8,3.2:", type=("build", "run")) - - depends_on("py-pycodestyle@1.5.7:1.7.0", when="@:1.2.4", type=("build", "run")) depends_on("py-pycodestyle@2.3.0:", when="@1.3:", type=("build", "run")) depends_on("py-pycodestyle@2.4.0:", when="@1.4:", type=("build", "run")) depends_on("py-pycodestyle@2.7.0:", when="@1.5.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-awkward/package.py b/var/spack/repos/builtin/packages/py-awkward/package.py index ccb4cbf40f..7528254632 100644 --- a/var/spack/repos/builtin/packages/py-awkward/package.py +++ b/var/spack/repos/builtin/packages/py-awkward/package.py @@ -16,7 +16,6 @@ class PyAwkward(PythonPackage): maintainers("vvolkl") version("main", branch="main") - version("master", branch="main", deprecated=True) version("2.1.1", sha256="fda8e1634161b8b46b151c074ff0fc631fc0feaec2ec277c4b40a2095110b0dd") version("2.1.0", sha256="73f7a76a1fb43e2557befee54b1381f3e6d90636983cdc54da1c2bcb9ad4c1a8") version("2.0.10", sha256="8dae67afe50f5cf1677b4062f9b29dc7e6893420d0af5a0649364b117a3502af") diff --git a/var/spack/repos/builtin/packages/py-awkward1/package.py b/var/spack/repos/builtin/packages/py-awkward1/package.py deleted file mode 100644 index 7aac191d7a..0000000000 --- a/var/spack/repos/builtin/packages/py-awkward1/package.py +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyAwkward1(PythonPackage): - """DEPRECATED! This package was renamed to py-awkward.""" - - git = "https://github.com/scikit-hep/awkward-1.0.git" - url = "https://github.com/scikit-hep/awkward-1.0/archive/0.3.1.tar.gz" - homepage = "https://awkward-array.org" - - maintainers("vvolkl") - - version( - "1.1.2", - sha256="626e3a6a2a92dd67abc8692b1ebfa1b447b9594352d6ce8c86c37d7299dc4602", - deprecated=True, - ) - version( - "0.3.1", - sha256="7126d9feab8828b0b4f4c6dbc9e28c269a91e28eef4a6033d7ebb5db21f1dab3", - deprecated=True, - ) - - patch("pybind11.patch") - - depends_on("py-setuptools", type="build") - - depends_on("python@3.6:", type=("build", "run")) - depends_on("py-numpy@1.13.1:", type=("build", "run")) - depends_on("py-pybind11", type=("build", "link")) - depends_on("dlpack", when="@1.0.0:") - depends_on("rapidjson") - depends_on("cmake", type="build") diff --git a/var/spack/repos/builtin/packages/py-awkward1/pybind11.patch b/var/spack/repos/builtin/packages/py-awkward1/pybind11.patch deleted file mode 100644 index 8edc76919f..0000000000 --- a/var/spack/repos/builtin/packages/py-awkward1/pybind11.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fedfe3a..bf762c9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -107,7 +107,7 @@ addtest(test0074 tests/test_0074-argsort-and-sort-rawarray.cpp) - - # Third tier: Python modules. - if (PYBUILD) -- add_subdirectory(pybind11) -+ find_package(pybind11) - - file(GLOB LAYOUT_SOURCES "src/python/*.cpp") - pybind11_add_module(_ext ${LAYOUT_SOURCES}) - diff --git a/var/spack/repos/builtin/packages/py-black/package.py b/var/spack/repos/builtin/packages/py-black/package.py index 6d50669415..e9813273f5 100644 --- a/var/spack/repos/builtin/packages/py-black/package.py +++ b/var/spack/repos/builtin/packages/py-black/package.py @@ -26,13 +26,6 @@ class PyBlack(PythonPackage): version("22.3.0", sha256="35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79") version("22.1.0", sha256="a7c0192d35635f6fc1174be575cb7915e92e5dd629ee79fdaf0dcfa41a80afb5") - # This is the last v21 release, and it's needed to format for Python 2.7 - version( - "21.12b0", - sha256="77b80f693a569e2e527958459634f18df9b0ba2625ba4e0c2d5da5be42e6f2b3", - deprecated=True, - ) - variant("colorama", default=False, description="enable colorama support") variant("uvloop", default=False, description="enable uvloop support") variant("d", default=False, description="enable blackd HTTP server") diff --git a/var/spack/repos/builtin/packages/py-cdo/package.py b/var/spack/repos/builtin/packages/py-cdo/package.py index 21969592bf..3f261a1308 100644 --- a/var/spack/repos/builtin/packages/py-cdo/package.py +++ b/var/spack/repos/builtin/packages/py-cdo/package.py @@ -15,20 +15,14 @@ class PyCdo(PythonPackage): maintainers("Try2Code", "skosukhin") version("1.5.6", sha256="fec1a75382f01b3c9c368e8f143d98b12323e06975663f87d9b60c739ae1d335") - version( - "1.3.2", - sha256="9f78879d90d14134f2320565016d0d371b7dfe7ec71110fd313868ec1db34aee", - deprecated=True, - ) depends_on("python@2.7:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("cdo+netcdf", type="run") depends_on("py-netcdf4", type=("build", "run")) - depends_on("py-scipy", type=("build", "run"), when="@:1.4") - depends_on("py-xarray", type=("build", "run"), when="@1.3.4:") - depends_on("py-six", type=("build", "run"), when="@1.3.3:") + depends_on("py-xarray", type=("build", "run")) + depends_on("py-six", type=("build", "run")) def setup_run_environment(self, env): env.set("CDO", self.spec["cdo"].prefix.bin.cdo) diff --git a/var/spack/repos/builtin/packages/py-codecov/package.py b/var/spack/repos/builtin/packages/py-codecov/package.py deleted file mode 100644 index 1823586f07..0000000000 --- a/var/spack/repos/builtin/packages/py-codecov/package.py +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyCodecov(PythonPackage): - """Hosted coverage reports for Github, Bitbucket and Gitlab.""" - - homepage = "https://github.com/codecov/codecov-python" - pypi = "codecov/codecov-2.0.15.tar.gz" - - # Since codecov has been removed from PyPI, py-codecov is deprecated. - # The new codecov uploader can be installed with the package codecov. - version( - "2.0.15", - sha256="8ed8b7c6791010d359baed66f84f061bba5bd41174bf324c31311e8737602788", - deprecated=True, - ) - - depends_on("py-setuptools", type=("build", "run")) - depends_on("py-requests@2.7.9:", type=("build", "run")) - depends_on("py-coverage", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-cupy/package.py b/var/spack/repos/builtin/packages/py-cupy/package.py index f0f40c53b6..b9dee225b4 100644 --- a/var/spack/repos/builtin/packages/py-cupy/package.py +++ b/var/spack/repos/builtin/packages/py-cupy/package.py @@ -17,11 +17,6 @@ class PyCupy(PythonPackage, CudaPackage): pypi = "cupy/cupy-8.0.0.tar.gz" version("11.2.0", sha256="c33361f117a347a63f6996ea97446d17f1c038f1a1f533e502464235076923e2") - version( - "8.0.0", - sha256="d1dcba5070dfa754445d010cdc952ff6b646d5f9bdcd7a63e8246e2472c3ddb8", - deprecated=True, - ) depends_on("python@3.7:", type=("build", "run")) depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-dask/package.py b/var/spack/repos/builtin/packages/py-dask/package.py index 274f457c82..cff78bd133 100644 --- a/var/spack/repos/builtin/packages/py-dask/package.py +++ b/var/spack/repos/builtin/packages/py-dask/package.py @@ -19,60 +19,21 @@ class PyDask(PythonPackage): version("2021.6.2", sha256="8588fcd1a42224b7cfcd2ebc8ad616734abb6b1a4517efd52d89c7dd66eb91f8") version("2021.4.1", sha256="195e4eeb154222ea7a1c368119b5f321ee4ec9d78531471fe0145a527f744aa8") version("2020.12.0", sha256="43e745afd4b464e6c0113131e430a16dce6ac42460b06e24d799093d098f7ab0") - version( - "2.16.0", - sha256="2af5b0dcd48ce679ce0321cf91de623f4fe376262789b951fefa3c334002f350", - deprecated=True, - ) - version( - "1.2.2", - sha256="5e7876bae2a01b355d1969b73aeafa23310febd8c353163910b73e93dc7e492c", - deprecated=True, - ) - version( - "1.1.2", - sha256="93b355b9a9c9a3ddbb39fab99d5759aad5cfd346f4520b87788970e80cf97256", - deprecated=True, - ) - version( - "1.1.0", - sha256="e76088e8931b326c05a92d2658e07b94a6852b42c13a7560505a8b2354871454", - deprecated=True, - ) - version( - "0.17.4", - sha256="c111475a3d1f8cba41c8094e1fb1831c65015390dcef0308042a11a9606a2f6d", - deprecated=True, - ) - version( - "0.8.1", - sha256="43deb1934cd033668e5e60b735f45c9c3ee2813f87bd51c243f975e55267fa43", - deprecated=True, - ) variant("array", default=True, description="Install requirements for dask.array") - variant("bag", default=True, description="Install requirements for dask.bag") + variant( + "bag", default=True, when="@:2021.3.0", description="Install requirements for dask.bag" + ) variant("dataframe", default=True, description="Install requirements for dask.dataframe") variant("distributed", default=True, description="Install requirements for dask.distributed") variant("diagnostics", default=False, description="Install requirements for dask.diagnostics") variant( "delayed", default=True, + when="@:2021.3.0", description="Install requirements for dask.delayed (dask.imperative)", ) - variant("yaml", default=True, description="Ensure support for YAML configuration files") - conflicts("~bag", when="@2021.3.1:") - conflicts("+distributed", when="@:0.4.0,0.7.6:0.8.1") - conflicts("+diagnostics", when="@:0.5.0") - conflicts("~delayed", when="@2021.3.1:") - conflicts("+yaml", when="@:0.17.5") - conflicts("~yaml", when="@2.17.1:") - - depends_on("python@2.7:2.8,3.5:", type=("build", "run")) - depends_on("python@3.5:", type=("build", "run"), when="@2.0.0:") - depends_on("python@3.6:", type=("build", "run"), when="@2.7.0:") - depends_on("python@3.7:", type=("build", "run"), when="@2021.3.1:") depends_on("python@3.8:", type=("build", "run"), when="@2022.10.2:") depends_on("py-setuptools", type="build") @@ -81,7 +42,7 @@ class PyDask(PythonPackage): # Common requirements depends_on("py-packaging@20:", type="build", when="@2022.10.2:") - depends_on("py-pyyaml", type=("build", "run"), when="@2.17.1:") + depends_on("py-pyyaml", type=("build", "run")) depends_on("py-pyyaml@5.3.1:", type=("build", "run"), when="@2022.10.2:") depends_on("py-cloudpickle@1.1.1:", type=("build", "run"), when="@2021.3.1:") depends_on("py-cloudpickle@1.5.0:", type=("build", "run"), when="@2023.4.1:") @@ -96,148 +57,63 @@ class PyDask(PythonPackage): depends_on("py-importlib-metadata@4.13.0:", type=("build", "run"), when="@2023.4.0:") # Requirements for dask.array - depends_on("py-numpy", type=("build", "run"), when="@:0.17.1 +array") - depends_on("py-numpy@1.10.4:", type=("build", "run"), when="@0.17.2: +array") - depends_on("py-numpy@1.11.0:", type=("build", "run"), when="@0.17.3: +array") - depends_on("py-numpy@1.13.0:", type=("build", "run"), when="@1.2.1: +array") depends_on("py-numpy@1.15.1:", type=("build", "run"), when="@2020.12.0: +array") depends_on("py-numpy@1.16.0:", type=("build", "run"), when="@2021.3.1: +array") depends_on("py-numpy@1.18.0:", type=("build", "run"), when="@2022.10.2: +array") depends_on("py-numpy@1.21.0:", type=("build", "run"), when="@2023.4.0: +array") - - depends_on("py-toolz", type=("build", "run"), when="@:0.6.1 +array") - depends_on("py-toolz@0.7.2:", type=("build", "run"), when="@0.7.0: +array") - depends_on("py-toolz@0.7.3:", type=("build", "run"), when="@0.14.1: +array") # The dependency on py-toolz is non-optional starting version 2021.3.1 - depends_on("py-toolz@0.8.2:", type=("build", "run"), when="@2.13.0:2021.3.0 +array") + depends_on("py-toolz@0.8.2:", type=("build", "run"), when="@:2021.3.0 +array") # Requirements for dask.bag - depends_on("py-dill", type=("build", "run"), when="@:0.7.5 +bag") - depends_on("py-cloudpickle", type=("build", "run"), when="@0.7.6: +bag") depends_on("py-cloudpickle@0.2.1:", type=("build", "run"), when="@0.8.2: +bag") # The dependency on py-cloudpickle is non-optional starting version 2021.3.1 depends_on("py-cloudpickle@0.2.2:", type=("build", "run"), when="@2.13.0:2021.3.0 +bag") - - depends_on("py-fsspec@0.3.3:", type=("build", "run"), when="@2.2.0: +bag") - depends_on("py-fsspec@0.5.1:", type=("build", "run"), when="@2.5.0: +bag") # The dependency on py-fsspec is non-optional starting version 2021.3.1 - depends_on("py-fsspec@0.6.0:", type=("build", "run"), when="@2.8.0:2021.3.0 +bag") - - depends_on("py-toolz", type=("build", "run"), when="@:0.6.1 +bag") - depends_on("py-toolz@0.7.2:", type=("build", "run"), when="@0.7.0: +bag") - depends_on("py-toolz@0.7.3:", type=("build", "run"), when="@0.14.1: +bag") + depends_on("py-fsspec@0.6.0:", type=("build", "run"), when="@:2021.3.0 +bag") # The dependency on py-toolz is non-optional starting version 2021.3.1 - depends_on("py-toolz@0.8.2:", type=("build", "run"), when="@2.13.0:2021.3.0 +bag") - - depends_on("py-partd@0.3.2:", type=("build", "run"), when="@0.6.0: +bag") - depends_on("py-partd@0.3.3:", type=("build", "run"), when="@0.9.0: +bag") - depends_on("py-partd@0.3.5:", type=("build", "run"), when="@0.10.2: +bag") - depends_on("py-partd@0.3.6:", type=("build", "run"), when="@0.12.0: +bag") - depends_on("py-partd@0.3.7:", type=("build", "run"), when="@0.13.0: +bag") - depends_on("py-partd@0.3.8:", type=("build", "run"), when="@0.15.0: +bag") + depends_on("py-toolz@0.8.2:", type=("build", "run"), when="@:2021.3.0 +bag") # The dependency on py-partd is non-optional starting version 2021.3.1 - depends_on("py-partd@0.3.10:", type=("build", "run"), when="@2.0.0:2021.3.0 +bag") + depends_on("py-partd@0.3.10:", type=("build", "run"), when="@:2021.3.0 +bag") # Requirements for dask.dataframe - depends_on("py-numpy", type=("build", "run"), when="@:0.17.1 +dataframe") - depends_on("py-numpy@1.10.4:", type=("build", "run"), when="@0.17.2: +dataframe") - depends_on("py-numpy@1.11.0:", type=("build", "run"), when="@0.17.3: +dataframe") - depends_on("py-numpy@1.13.0:", type=("build", "run"), when="@1.2.1: +dataframe") depends_on("py-numpy@1.15.1:", type=("build", "run"), when="@2020.12.0: +dataframe") depends_on("py-numpy@1.16.0:", type=("build", "run"), when="@2021.3.1: +dataframe") depends_on("py-numpy@1.18.0:", type=("build", "run"), when="@2022.10.2: +dataframe") depends_on("py-numpy@1.21.0:", type=("build", "run"), when="@2023.4.0: +dataframe") - - depends_on("py-pandas@0.16.0:", type=("build", "run"), when="+dataframe") - depends_on("py-pandas@0.18.0:", type=("build", "run"), when="@0.9.0: +dataframe") - depends_on("py-pandas@0.19.0:", type=("build", "run"), when="@0.14.0: +dataframe") - depends_on("py-pandas@0.21.0:", type=("build", "run"), when="@1.2.1: +dataframe") - depends_on("py-pandas@0.23.0:", type=("build", "run"), when="@2.11.0: +dataframe") depends_on("py-pandas@0.25.0:", type=("build", "run"), when="@2020.12.0: +dataframe") depends_on("py-pandas@1.0:", type=("build", "run"), when="@2022.10.2: +dataframe") depends_on("py-pandas@1.3:", type=("build", "run"), when="@2023.4.0: +dataframe") - - depends_on("py-toolz", type=("build", "run"), when="@:0.6.1 +dataframe") - depends_on("py-toolz@0.7.2:", type=("build", "run"), when="@0.7.0: +dataframe") - depends_on("py-toolz@0.7.3:", type=("build", "run"), when="@0.14.1: +dataframe") # The dependency on py-toolz is non-optional starting version 2021.3.1 - depends_on("py-toolz@0.8.2:", type=("build", "run"), when="@2.13.0:2021.3.0 +dataframe") - - depends_on("py-partd@0.3.2:", type=("build", "run"), when="@0.6.0: +dataframe") - depends_on("py-partd@0.3.3:", type=("build", "run"), when="@0.9.0: +dataframe") - depends_on("py-partd@0.3.5:", type=("build", "run"), when="@0.10.2: +dataframe") - depends_on("py-partd@0.3.7:", type=("build", "run"), when="@0.13.0: +dataframe") - depends_on("py-partd@0.3.8:", type=("build", "run"), when="@0.15.0: +dataframe") - depends_on("py-partd@0.3.10:", type=("build", "run"), when="@2.0.0: +dataframe") + depends_on("py-toolz@0.8.2:", type=("build", "run"), when="@:2021.3.0 +dataframe") # The dependency on py-partd is non-optional starting version 2021.3.1 - depends_on("py-partd@0.3.10:", type=("build", "run"), when="@2.0.0:2021.3.0 +dataframe") - - depends_on("py-cloudpickle@0.2.1:", type=("build", "run"), when="@0.8.2:2.6.0 +dataframe") - - depends_on("py-fsspec@0.3.3:", type=("build", "run"), when="@2.2.0: +dataframe") - depends_on("py-fsspec@0.5.1:", type=("build", "run"), when="@2.5.0: +dataframe") + depends_on("py-partd@0.3.10:", type=("build", "run"), when="@:2021.3.0 +dataframe") # The dependency on py-fsspec is non-optional starting version 2021.3.1 - depends_on("py-fsspec@0.6.0:", type=("build", "run"), when="@2.8.0:2021.3.0 +dataframe") + depends_on("py-fsspec@0.6.0:", type=("build", "run"), when="@:2021.3.0 +dataframe") # Requirements for dask.distributed - depends_on("py-dill", type=("build", "run"), when="@:0.7.5 +distributed") - depends_on("py-pyzmq", type=("build", "run"), when="@:0.7.5 +distributed") - depends_on("py-distributed@:2021.8.0", type=("build", "run"), when="@0.8.2:0.8 +distributed") - depends_on("py-distributed@1.9:2021.8.0", type=("build", "run"), when="@0.9 +distributed") - depends_on("py-distributed@1.10:2021.8.0", type=("build", "run"), when="@0.10 +distributed") - depends_on("py-distributed@1.14:2021.8.0", type=("build", "run"), when="@0.12 +distributed") - depends_on("py-distributed@1.15:2021.8.0", type=("build", "run"), when="@0.13 +distributed") - depends_on( - "py-distributed@1.16:2021.8.0", type=("build", "run"), when="@0.14.1:0.14 +distributed" - ) - depends_on("py-distributed@1.20:2021.8.0", type=("build", "run"), when="@0.16 +distributed") - depends_on("py-distributed@1.21:2021.8.0", type=("build", "run"), when="@0.17 +distributed") - depends_on( - "py-distributed@1.22:2021.8.0", type=("build", "run"), when="@0.18.0:1 +distributed" - ) depends_on( - "py-distributed@2.0:2021.8.0", type=("build", "run"), when="@2.0.0:2020.11 +distributed" - ) - depends_on( - "py-distributed@2020.12.0:2021.8.0", - type=("build", "run"), - when="@2020.12.0:2021.6.1 +distributed", + "py-distributed@2020.12.0:2021.8.0", type=("build", "run"), when="@:2021.6.1 +distributed" ) depends_on("py-distributed@2021.6.2", type=("build", "run"), when="@2021.6.2 +distributed") depends_on("py-distributed@2022.10.2", type=("build", "run"), when="@2022.10.2 +distributed") depends_on("py-distributed@2023.4.1", type=("build", "run"), when="@2023.4.1 +distributed") # Requirements for dask.diagnostics - depends_on("py-bokeh@1.0.0:", type=("build", "run"), when="@2.0.0: +diagnostics") - depends_on("py-bokeh@1.0.0:1,2.0.1:", type=("build", "run"), when="@2.26.0: +diagnostics") + depends_on("py-bokeh@1.0.0:1,2.0.1:", type=("build", "run"), when="+diagnostics") depends_on("py-bokeh@2.4.2:2", type=("build", "run"), when="@2022.10.2:2023.3 +diagnostics") depends_on("py-bokeh@2.4.2:", type=("build", "run"), when="@2023.4.0: +diagnostics") depends_on("py-jinja2", type=("build", "run"), when="@2022.10.2: +diagnostics") depends_on("py-jinja2@2.10.3", type=("build", "run"), when="@2023.4.0: +diagnostics") # Requirements for dask.delayed - depends_on("py-cloudpickle@0.2.1:", type=("build", "run"), when="@2.7.0: +delayed") # The dependency on py-cloudpickle is non-optional starting version 2021.3.1 - depends_on("py-cloudpickle@0.2.2:", type=("build", "run"), when="@2.13.0:2021.3.0 +delayed") - - depends_on("py-toolz@0.7.2:", type=("build", "run"), when="@0.8.1: +delayed") - depends_on("py-toolz@0.7.3:", type=("build", "run"), when="@0.14.1: +delayed") + depends_on("py-cloudpickle@0.2.2:", type=("build", "run"), when="@:2021.3.0 +delayed") # The dependency on py-toolz is non-optional starting version 2021.3.1 - depends_on("py-toolz@0.8.2:", type=("build", "run"), when="@2.13.0:2021.3.0 +delayed") - - # Support for YAML configuration files - # The dependency on py-pyyaml is non-optional starting version 2.17.1 - depends_on("py-pyyaml", type=("build", "run"), when="@0.18.0:2.17.0 +yaml") + depends_on("py-toolz@0.8.2:", type=("build", "run"), when="@:2021.3.0 +delayed") @property def import_modules(self): - modules = ["dask"] - - if self.spec.satisfies("@0.9.0:"): - modules.append("dask.bytes") - - if self.spec.satisfies("@:0.20.2"): - modules.append("dask.store") + modules = ["dask", "dask.bytes"] if "+array" in self.spec: modules.append("dask.array") @@ -245,15 +121,8 @@ class PyDask(PythonPackage): if "+bag" in self.spec: modules.append("dask.bag") - if self.spec.satisfies("@:0.7.5 +distributed"): - modules.append("dask.distributed") - if "+dataframe" in self.spec: - modules.append("dask.dataframe") - if self.spec.satisfies("@0.8.2:"): - modules.append("dask.dataframe.tseries") - if self.spec.satisfies("@0.12.0:"): - modules.append("dask.dataframe.io") + modules.extend(["dask.dataframe", "dask.dataframe.tseries", "dask.dataframe.io"]) if "+diagnostics" in self.spec: modules.append("dask.diagnostics") diff --git a/var/spack/repos/builtin/packages/py-distributed/package.py b/var/spack/repos/builtin/packages/py-distributed/package.py index 77cfbea627..2fbeda844d 100644 --- a/var/spack/repos/builtin/packages/py-distributed/package.py +++ b/var/spack/repos/builtin/packages/py-distributed/package.py @@ -36,20 +36,7 @@ class PyDistributed(PythonPackage): version("2021.6.2", sha256="d7d112a86ab049dcefa3b21fd1baea4212a2c03d22c24bd55ad38d21a7f5d148") version("2021.4.1", sha256="4c1b189ec5aeaf770c473f730f4a3660dc655601abd22899e8a0662303662168") version("2020.12.0", sha256="2a0b6acc921cd4e0143a7c4383cdcbed7defbc4bd9dc3aab0c7f1c45f14f80e1") - version( - "2.10.0", - sha256="2f8cca741a20f776929cbad3545f2df64cf60207fb21f774ef24aad6f6589e8b", - deprecated=True, - ) - version( - "1.28.1", - sha256="3bd83f8b7eb5938af5f2be91ccff8984630713f36f8f66097e531a63f141c48a", - deprecated=True, - ) - depends_on("python@2.7:2.8,3.5:", when="@:1", type=("build", "run")) - depends_on("python@3.6:", when="@2:", type=("build", "run")) - depends_on("python@3.7:", when="@2021.4.1:", type=("build", "run")) depends_on("python@3.8:", when="@2022.2.1:", type=("build", "run")) depends_on("py-setuptools", type="build") depends_on("py-setuptools@62.6:", type="build", when="@2023.4.1:") @@ -59,25 +46,18 @@ class PyDistributed(PythonPackage): # Hence, no need for depends_on("py-dask", ...) depends_on("py-click@6.6:", type=("build", "run")) depends_on("py-click@8.0:", type=("build", "run"), when="@2023.4.1:") - depends_on("py-cloudpickle@0.2.2:", type=("build", "run"), when="@:2.16.0") - depends_on("py-cloudpickle@1.3.0:", type=("build", "run"), when="@2.17.0:2.20.0") - depends_on("py-cloudpickle@1.5.0:", type=("build", "run"), when="@2.21.0:") + depends_on("py-cloudpickle@1.5.0:", type=("build", "run")) depends_on("py-jinja2", type=("build", "run"), when="@2022.2.1:") depends_on("py-jinja2@2.10.3", type=("build", "run"), when="@2023.4.1:") depends_on("py-locket@1:", type=("build", "run"), when="@2022.2.1:") - depends_on("py-msgpack", type=("build", "run"), when="@:2.10.0") - depends_on("py-msgpack@0.6.0:", type=("build", "run"), when="@2.11.0:") + depends_on("py-msgpack@0.6.0:", type=("build", "run")) depends_on("py-msgpack@1.0.0:", type=("build", "run"), when="@2023.4.1:") depends_on("py-packaging@20.0:", type=("build", "run"), when="@2022.2.1:") depends_on("py-psutil@5.0:", type=("build", "run")) depends_on("py-psutil@5.7.0:", type=("build", "run"), when="@2023.4.1:") - depends_on("py-six", type=("build", "run"), when="@:1") depends_on("py-sortedcontainers@:1,2.0.2:", type=("build", "run")) depends_on("py-sortedcontainers@2.0.5:", type=("build", "run"), when="@2023.4.1:") - depends_on("py-tblib", type=("build", "run"), when="@:2.10.0") - depends_on("py-tblib@1.6.0:", type=("build", "run"), when="@2.11.0:") - depends_on("py-toolz@0.7.4:", type=("build", "run"), when="@:2.12.0") - depends_on("py-toolz@0.8.2:", type=("build", "run"), when="@2.13.0:") + depends_on("py-toolz@0.8.2:", type=("build", "run")) # Note that the setup.py is wrong for py-toolz, when="@2022.10.2". # See https://github.com/dask/distributed/pull/7309 depends_on("py-toolz@0.10.0:", type=("build", "run"), when="@2022.10.2:") diff --git a/var/spack/repos/builtin/packages/py-earthengine-api/package.py b/var/spack/repos/builtin/packages/py-earthengine-api/package.py index d716334f2a..e910119f2b 100644 --- a/var/spack/repos/builtin/packages/py-earthengine-api/package.py +++ b/var/spack/repos/builtin/packages/py-earthengine-api/package.py @@ -14,19 +14,13 @@ class PyEarthengineApi(PythonPackage): pypi = "earthengine-api/earthengine-api-0.1.186.tar.gz" version("0.1.344", sha256="bc5a270b8296aaae8574e68dfd93fe878bc5fbe77d1c41f90bcb5e5b830ca5c8") - version( - "0.1.186", - sha256="ced86dc969f5db13eea91944e29c39146bacbb7026a46f4b4ac349b365979627", - deprecated=True, - ) depends_on("py-setuptools", type="build") - depends_on("py-google-cloud-storage", when="@0.1.344:", type=("build", "run")) - depends_on("py-google-api-python-client@1.12.1:", when="@0.1.344:", type=("build", "run")) + depends_on("py-google-cloud-storage", type=("build", "run")) + depends_on("py-google-api-python-client@1.12.1:", type=("build", "run")) depends_on("py-google-api-python-client", type=("build", "run")) depends_on("py-google-auth@1.4.1:", type=("build", "run")) depends_on("py-google-auth-httplib2@0.0.3:", type=("build", "run")) depends_on("py-httplib2@0.9.2:0", type=("build", "run")) - depends_on("py-requests", when="@0.1.344:", type=("build", "run")) - depends_on("py-six", when="@:0.1.186", type=("build", "run")) + depends_on("py-requests", type=("build", "run")) depends_on("google-cloud-cli", type="run") diff --git a/var/spack/repos/builtin/packages/py-fenics-basix/package.py b/var/spack/repos/builtin/packages/py-fenics-basix/package.py index 0f8e5744d0..9e6d5b44b7 100644 --- a/var/spack/repos/builtin/packages/py-fenics-basix/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-basix/package.py @@ -18,36 +18,18 @@ class PyFenicsBasix(PythonPackage): version("0.6.0", sha256="687ae53153c98facac4080dcdc7081701db1dcea8c5e7ae3feb72aec17f83304") version("0.5.1", sha256="69133476ac35f0bd0deccb480676030378c341d7dfb2adaca22cd16b7e1dc1cb") version("0.4.2", sha256="a54f5e442b7cbf3dbb6319c682f9161272557bd7f42e2b8b8ccef88bc1b7a22f") - version( - "0.3.0", - sha256="9b148fd2a5485c94011fc6ca977ebdef0e51782a62b3654fc044f35b60e2bd07", - deprecated=True, - ) - version( - "0.2.0", - sha256="e1ec537737adb283717060221635092474e3f2b5b5ba79dfac74aa496bec2fcb", - deprecated=True, - ) - version( - "0.1.0", - sha256="2ab41fe6ad4f6c42f01b17a6e7c39debb4e0ae61c334d1caebee78b741bca4e7", - deprecated=True, - ) depends_on("fenics-basix@main", type=("build", "run"), when="@main") depends_on("fenics-basix@0.6.0", type=("build", "run"), when="@0.6.0") depends_on("fenics-basix@0.5.1", type=("build", "run"), when="@0.5.1") depends_on("fenics-basix@0.4.2", type=("build", "run"), when="@0.4.2") - depends_on("fenics-basix@0.3.0", type=("build", "run"), when="@0.3.0") - depends_on("fenics-basix@0.2.0", type=("build", "run"), when="@0.2.0") - depends_on("fenics-basix@0.1.0", type=("build", "run"), when="@0.1.0") - depends_on("py-setuptools@42:", type="build", when="@0.4:") + depends_on("py-setuptools@42:", type="build") depends_on("py-setuptools@40:", type="build") depends_on("py-numpy@1.21:", type=("build", "run")) depends_on("cmake@3.19:", type="build") depends_on("python@3.7:", type=("build", "run")) - depends_on("py-pybind11@2.9.1:", type="build", when="@0.4:") + depends_on("py-pybind11@2.9.1:", type="build") depends_on("py-pybind11@2.2.4:", type="build") depends_on("xtensor@0.23.10:", type="build", when="@:0.4") diff --git a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py index 53e3be6411..9106bd80a5 100644 --- a/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-dolfinx/package.py @@ -20,21 +20,6 @@ class PyFenicsDolfinx(PythonPackage): version("0.5.1", sha256="a570e3f6ed8e7c570e7e61d0e6fd44fa9dad2c5f8f1f48a6dc9ad22bacfbc973") version("0.5.0", sha256="503c70c01a44d1ffe48e052ca987693a49f8d201877652cabbe2a44eb3b7c040") version("0.4.1", sha256="68dcf29a26c750fcea5e02d8d58411e3b054313c3bf6fcbc1d0f08dd2851117f") - version( - "0.3.0", - sha256="4857d0fcb44a4e9bf9eb298ba5377abdee17a7ad0327448bdd06cce73d109bed", - deprecated=True, - ) - version( - "0.2.0", - sha256="e6462fc3b9653d335c28096f9b0393f966c55a64c77ed64cc6c949406cb1f2c3", - deprecated=True, - ) - version( - "0.1.0", - sha256="0269379769b5b6d4d1864ded64402ecaea08054c2a5793c8685ea15a59af5e33", - deprecated=True, - ) depends_on("cmake@3.19:", type="build") depends_on("hdf5", type="build") @@ -47,41 +32,29 @@ class PyFenicsDolfinx(PythonPackage): depends_on("fenics-dolfinx@0.5.1", when="@0.5.1") depends_on("fenics-dolfinx@0.5.0", when="@0.5.0") depends_on("fenics-dolfinx@0.4.1", when="@0.4.1") - depends_on("fenics-dolfinx@0.3.0", when="@0.3.0") - depends_on("fenics-dolfinx@0.2.0", when="@0.2.0") - depends_on("fenics-dolfinx@0.1.0", when="@0.1.0") depends_on("fenics-basix@main", type=("build", "link"), when="@main") depends_on("fenics-basix@0.6.0:0.6", type=("build", "link"), when="@0.6.0:0.6") depends_on("fenics-basix@0.5.1:0.5", type=("build", "link"), when="@0.5.0:0.5") depends_on("fenics-basix@0.4.2", type=("build", "link"), when="@0.4.1") - depends_on("fenics-basix@0.3.0", type=("build", "link"), when="@0.3.0") - depends_on("fenics-basix@0.2.0", type=("build", "link"), when="@0.2.0") - depends_on("fenics-basix@0.1.0", type=("build", "link"), when="@0.1.0") depends_on("py-fenics-ffcx@main", type=("build", "run"), when="@main") depends_on("py-fenics-ffcx@0.6", type=("build", "run"), when="@0.6") depends_on("py-fenics-ffcx@0.5.0.post0", type=("build", "run"), when="@0.5.0:0.5") depends_on("py-fenics-ffcx@0.4.2", type=("build", "run"), when="@0.4.1") - depends_on("py-fenics-ffcx@0.3.0", type=("build", "run"), when="@0.3.0") - depends_on("py-fenics-ffcx@0.2.0", type=("build", "run"), when="@0.2.0") - depends_on("py-fenics-ffcx@0.1.0", type=("build", "run"), when="@0.1.0") depends_on("py-fenics-ufl@main", type=("build", "run"), when="@main") depends_on("py-fenics-ufl@2023.1", type=("build", "run"), when="@0.6") depends_on("py-fenics-ufl@2022.2.0", type=("build", "run"), when="@0.5.0:0.5") depends_on("py-fenics-ufl@2022.1.0", type=("build", "run"), when="@0.4.1") - depends_on("py-fenics-ufl@2021.1.0", type=("build", "run"), when="@0.1:0.3.99") depends_on("py-numpy@1.21:", type=("build", "run")) depends_on("py-mpi4py", type=("build", "run")) depends_on("py-petsc4py", type=("build", "run")) - depends_on("py-pybind11@2.7.0:", type=("build", "run"), when="@0.4:") - depends_on("py-pybind11@2.2.4:", type=("build", "run")) + depends_on("py-pybind11@2.7.0:", type=("build", "run")) depends_on("xtensor@0.23.10:", type="build", when="@:0.5") - depends_on("py-setuptools@42:", type="build", when="@0.4:") - depends_on("py-setuptools@40:", type="build") + depends_on("py-setuptools@42:", type="build") depends_on("py-cffi", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py index f21011dafd..45c11e7952 100644 --- a/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py +++ b/var/spack/repos/builtin/packages/py-fenics-ffcx/package.py @@ -20,25 +20,9 @@ class PyFenicsFfcx(PythonPackage): "0.5.0.post0", sha256="039908c9998b51ba53e5deb3a97016062c262f0a4285218644304f7d3cd35882" ) version("0.4.2", sha256="3be6eef064d6ef907245db5b6cc15d4e603762e68b76e53e099935ca91ef1ee4") - version( - "0.3.0", - sha256="33fa1a0cc5762f360033c25a99ec9462be933f8ba413279e35cd2c3b5c3e6096", - deprecated=True, - ) - version( - "0.2.0", - sha256="f1dcd0973980706aba145274aeddeb771d2d730efcdb9b4be10adbe964f40d90", - deprecated=True, - ) - version( - "0.1.0", - sha256="98a47906146ac892fb4a358e04cbfd04066f12d0a4cdb505a6b08ff0b1a17e89", - deprecated=True, - ) depends_on("python@3.7:", type=("build", "run")) - depends_on("py-setuptools@58:", type=("build", "run"), when="@0.4:") - depends_on("py-setuptools@40:", type=("build", "run")) + depends_on("py-setuptools@58:", type=("build", "run")) depends_on("py-cffi", type=("build", "run")) depends_on("py-numpy@1.21:", type=("build", "run")) @@ -47,12 +31,8 @@ class PyFenicsFfcx(PythonPackage): depends_on("py-fenics-ufl@2023.1", type=("build", "run"), when="@0.6") depends_on("py-fenics-ufl@2022.2.0", type=("build", "run"), when="@0.5.0:0.5") depends_on("py-fenics-ufl@2022.1.0", type=("build", "run"), when="@0.4.2") - depends_on("py-fenics-ufl@2021.1.0", type=("build", "run"), when="@0.1.0:0.3") depends_on("py-fenics-basix@main", type=("build", "run"), when="@main") depends_on("py-fenics-basix@0.6.0:0.6", type=("build", "run"), when="@0.6.0:0.6") depends_on("py-fenics-basix@0.5.1:0.5", type=("build", "run"), when="@0.5.0:0.5") depends_on("py-fenics-basix@0.4.2", type=("build", "run"), when="@0.4.2") - depends_on("py-fenics-basix@0.3.0", type=("build", "run"), when="@0.3.0") - depends_on("py-fenics-basix@0.2.0", type=("build", "run"), when="@0.2.0") - depends_on("py-fenics-basix@0.1.0", type=("build", "run"), when="@0.1.0") diff --git a/var/spack/repos/builtin/packages/py-fiona/package.py b/var/spack/repos/builtin/packages/py-fiona/package.py index 070b13c78f..37da11dd4c 100644 --- a/var/spack/repos/builtin/packages/py-fiona/package.py +++ b/var/spack/repos/builtin/packages/py-fiona/package.py @@ -25,28 +25,17 @@ class PyFiona(PythonPackage): version("1.8.21", sha256="3a0edca2a7a070db405d71187214a43d2333a57b4097544a3fcc282066a58bfc") version("1.8.20", sha256="a70502d2857b82f749c09cb0dea3726787747933a2a1599b5ab787d74e3c143b") version("1.8.18", sha256="b732ece0ff8886a29c439723a3e1fc382718804bb057519d537a81308854967a") - version( - "1.8.6", - sha256="fa31dfe8855b9cd0b128b47a4df558f1b8eda90d2181bff1dd9854e5556efb3e", - deprecated=True, - ) - version( - "1.7.12", - sha256="8b54eb8422d7c502bb7776b184018186bede1a489cf438a7a47f992ade6a0e51", - deprecated=True, - ) # pyproject.toml depends_on("python@3.7:", when="@1.9:", type=("build", "link", "run")) depends_on("python@2.6:", when="@1.8.22:1.8", type=("build", "link", "run")) depends_on("python@2.6:3.10", when="@1.8.21", type=("build", "link", "run")) - depends_on("python@2.6:3.9", when="@1.8.12:1.8.20", type=("build", "link", "run")) - depends_on("python@2.6:3.8", when="@:1.8.11", type=("build", "link", "run")) + depends_on("python@2.6:3.9", when="@:1.8.20", type=("build", "link", "run")) depends_on("py-cython@0.29.29:0.29", when="@1.9:", type="build") depends_on("py-setuptools@61:", when="@1.9:", type="build") depends_on("py-attrs@19.2:", when="@1.9:", type=("build", "run")) depends_on("py-attrs@17:", type=("build", "run")) - depends_on("py-certifi", when="@1.8.18:", type=("build", "run")) + depends_on("py-certifi", type=("build", "run")) depends_on("py-click@8", when="@1.9:", type=("build", "run")) depends_on("py-click@4:", type=("build", "run")) depends_on("py-click-plugins@1:", type=("build", "run")) @@ -63,6 +52,3 @@ class PyFiona(PythonPackage): depends_on("py-setuptools", when="@:1.9.1", type=("build", "run")) depends_on("py-munch@2.3.2:", when="@1.9.0:1.9.3", type=("build", "run")) depends_on("py-munch", when="@:1.8", type=("build", "run")) - - # error: implicit declaration of function 'OSRFixup' is invalid in C99 - conflicts("%apple-clang@12:", when="@:1.8.9") diff --git a/var/spack/repos/builtin/packages/py-fury/package.py b/var/spack/repos/builtin/packages/py-fury/package.py index e49fcae615..ff3edf19b1 100644 --- a/var/spack/repos/builtin/packages/py-fury/package.py +++ b/var/spack/repos/builtin/packages/py-fury/package.py @@ -21,7 +21,6 @@ class PyFury(PythonPackage): depends_on("vtk+python@8.1.2:8,9.0.1:", type=("build", "run")) depends_on("pil@5.4.1:", type=("build", "run")) - depends_on("py-codecov", type="test") depends_on("py-coverage", type="test") depends_on("py-flake8", type="test") depends_on("py-pytest", type="test") diff --git a/var/spack/repos/builtin/packages/py-getorganelle/package.py b/var/spack/repos/builtin/packages/py-getorganelle/package.py deleted file mode 100644 index aebb767706..0000000000 --- a/var/spack/repos/builtin/packages/py-getorganelle/package.py +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyGetorganelle(PythonPackage): - """Organelle Genome Assembly Toolkit (Chloroplast/Mitocondrial/ITS)""" - - homepage = "https://github.com/Kinggerm/GetOrganelle" - url = "https://github.com/Kinggerm/GetOrganelle/archive/refs/tags/1.7.5.0.tar.gz" - - maintainers("dorton21") - - # renamed to getorganelle - version( - "1.7.5.0", - sha256="c498196737726cb4c0158f23037bf301a069f5028ece729bb4d09c7d915df93d", - deprecated=True, - ) - - depends_on("py-setuptools", type="build") - depends_on("py-numpy@1.16.4:", type=("build", "run")) - depends_on("py-scipy@1.3.0:", type=("build", "run")) - depends_on("py-sympy@1.4:", type=("build", "run")) - depends_on("py-requests", type=("build", "run")) - - depends_on("bowtie2", type="run") - depends_on("spades", type="run") - depends_on("blast-plus", type="run") - - # Allow access to relevant runtime scripts - # I.e. get_organelle_config.py, get_organelle_from_reads.py, etc. - def setup_run_environment(self, env): - env.prepend_path("PATH", prefix) - env.prepend_path("PATH", prefix.Utilities) diff --git a/var/spack/repos/builtin/packages/py-griddataformats/package.py b/var/spack/repos/builtin/packages/py-griddataformats/package.py index f4dc0ddca6..9722231485 100644 --- a/var/spack/repos/builtin/packages/py-griddataformats/package.py +++ b/var/spack/repos/builtin/packages/py-griddataformats/package.py @@ -18,36 +18,9 @@ class PyGriddataformats(PythonPackage): maintainers("RMeli") version("1.0.1", sha256="ad2c9ab7d672a6d8c426de7d083eee4f3e2b0bd59391675d30683c768ab83cc4") - version( - "0.5.0", - sha256="f317ed60708de22d1b2a76ce89a00f722d903291b1055ff1018d441870c39d69", - deprecated=True, - ) - version( - "0.4.1", - sha256="b362662c2dc475e2a3895fe044eaaa9a707bd660fd109a63dac84a47236690a3", - deprecated=True, - ) - version( - "0.4.0", - sha256="f81d6b75aa7ebd9e8b64e14558c2d2583a0589829382beb4ef69860110261512", - deprecated=True, - ) - version( - "0.3.3", - sha256="938f0efcb3bc2f58ec85048b933942da8a52c134170acc97cb095f09d3698fbd", - deprecated=True, - ) depends_on("py-setuptools", type="build") - - depends_on("python@3.8:", when="@1:", type=("build", "run")) - - depends_on("py-numpy@1.19:", when="@1:", type=("build", "run")) - depends_on("py-scipy", when="@1:", type=("build", "run")) - depends_on("py-mrcfile", when="@1:", type=("build", "run")) - - # Deprecated - depends_on("python@2.7:", when="@0", type=("build", "run")) - depends_on("py-numpy@1.0.3:", when="@0", type=("build", "run")) - depends_on("py-six", when="@0", type=("build", "run")) + depends_on("python@3.8:", type=("build", "run")) + depends_on("py-numpy@1.19:", type=("build", "run")) + depends_on("py-scipy", type=("build", "run")) + depends_on("py-mrcfile", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-guidata/package.py b/var/spack/repos/builtin/packages/py-guidata/package.py deleted file mode 100644 index 6bf122e374..0000000000 --- a/var/spack/repos/builtin/packages/py-guidata/package.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyGuidata(PythonPackage): - """Automatic graphical user interfaces generation for easy dataset editing - and display""" - - homepage = "https://github.com/PierreRaybaut/guidata" - pypi = "guidata/guidata-1.7.5.zip" - - version("1.7.5", sha256="531d5e9ea784120c2e14212cfbd9c63f78fc7a77bcb9c5497be984584ee455c0") - - # See `doc/installation.rst` - depends_on("python@2.6:2,3.2:", type=("build", "run")) - depends_on("py-setuptools", type="build") - depends_on("py-pyqt5@5.5:", type=("build", "run")) - depends_on("py-spyder@2.0.10:", type=("build", "run")) # TODO: spyderlib == spyder? diff --git a/var/spack/repos/builtin/packages/py-guiqwt/package.py b/var/spack/repos/builtin/packages/py-guiqwt/package.py deleted file mode 100644 index a072410d76..0000000000 --- a/var/spack/repos/builtin/packages/py-guiqwt/package.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyGuiqwt(PythonPackage): - """guiqwt is a set of tools for curve and image plotting - (extension to PythonQwt)""" - - homepage = "https://github.com/PierreRaybaut/guiqwt" - pypi = "guiqwt/guiqwt-3.0.2.zip" - - version("3.0.2", sha256="387c0b9430624ecc87931e33ff963785194968c9f848337eb050eca48c6cd858") - - depends_on("py-setuptools", type="build") - depends_on("py-numpy@1.3:", type=("build", "run")) - depends_on("py-scipy@0.7:", type=("build", "run")) - depends_on("py-guidata@1.7.0:", type=("build", "run")) - depends_on("py-pythonqwt@0.5.0:", type=("build", "run")) - depends_on("pil", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-html5lib/package.py b/var/spack/repos/builtin/packages/py-html5lib/package.py index bd33943623..692980c408 100644 --- a/var/spack/repos/builtin/packages/py-html5lib/package.py +++ b/var/spack/repos/builtin/packages/py-html5lib/package.py @@ -12,22 +12,10 @@ class PyHtml5lib(PythonPackage): homepage = "https://github.com/html5lib/html5lib-python" pypi = "html5lib/html5lib-1.1.tar.gz" - version( - "1.1", - sha256="b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f", - preferred=True, - ) + version("1.1", sha256="b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f") version("1.0.1", sha256="66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736") version("0.99", sha256="aff6fd3031c563883197e5a04b7df324086ff5f358278a0386808c463a077e59") - version( - "099", - sha256="2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868", - deprecated=True, - ) - depends_on("python@2.6:2.8,3.2:", when="@0.99", type=("build", "run")) - depends_on("python@2.7:2.8,3.3:", when="@1.0.1:", type=("build", "run")) - depends_on("python@2.7:2.8,3.5:", when="@1.1:", type=("build", "run")) depends_on("py-six", type=("build", "run")) depends_on("py-six@1.9:", type=("build", "run"), when="@1.0.1:") depends_on("py-setuptools", type="build", when="@1.0.1:") diff --git a/var/spack/repos/builtin/packages/py-ipython/package.py b/var/spack/repos/builtin/packages/py-ipython/package.py index f7542d609f..1963265d54 100644 --- a/var/spack/repos/builtin/packages/py-ipython/package.py +++ b/var/spack/repos/builtin/packages/py-ipython/package.py @@ -34,53 +34,43 @@ class PyIpython(PythonPackage): version("7.3.0", sha256="06de667a9e406924f97781bda22d5d76bfb39762b678762d86a466e63f65dc39") version("5.8.0", sha256="4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906") version("5.1.0", sha256="7ef4694e1345913182126b219aaa4a0047e191af414256da6772cf249571b961") - version( - "3.1.0", - sha256="532092d3f06f82b1d8d1e5c37097eae19fcf025f8f6a4b670dd49c3c338d5624", - deprecated=True, - ) - version( - "2.3.1", - sha256="3e98466aa2fe54540bcba9aa6e01a39f40110d67668c297340c4b9514b7cc49c", - deprecated=True, - ) depends_on("python@3.9:", when="@8.13.1:", type=("build", "run")) depends_on("python@3.8:", when="@8:", type=("build", "run")) depends_on("py-setuptools@51:", when="@8:", type="build") - depends_on("py-setuptools@18.5:", when="@4.1:7", type="run") + depends_on("py-setuptools@18.5:", when="@:7", type="run") depends_on("py-setuptools", type="build") - depends_on("py-appnope", when="@4: platform=darwin", type=("build", "run")) + depends_on("py-appnope", when="platform=darwin", type=("build", "run")) depends_on("py-backcall", when="@7.3.0:", type=("build", "run")) - depends_on("py-colorama", when="@5: platform=windows", type=("build", "run")) - depends_on("py-decorator", when="@4:", type=("build", "run")) + depends_on("py-colorama", when="platform=windows", type=("build", "run")) + depends_on("py-decorator", type=("build", "run")) depends_on("py-jedi@0.16:", when="@7.18,7.20:", type=("build", "run")) depends_on("py-jedi@0.10:", when="@7.5:7.17,7.19", type=("build", "run")) depends_on("py-matplotlib-inline", when="@7.23:", type=("build", "run")) depends_on("py-pexpect@4.4:", when="@7.18: platform=linux", type=("build", "run")) depends_on("py-pexpect@4.4:", when="@7.18: platform=darwin", type=("build", "run")) depends_on("py-pexpect@4.4:", when="@7.18: platform=cray", type=("build", "run")) - depends_on("py-pexpect", when="@4: platform=linux", type=("build", "run")) - depends_on("py-pexpect", when="@4: platform=darwin", type=("build", "run")) - depends_on("py-pexpect", when="@4: platform=cray", type=("build", "run")) - depends_on("py-pickleshare", when="@4:", type=("build", "run")) + depends_on("py-pexpect", when="platform=linux", type=("build", "run")) + depends_on("py-pexpect", when="platform=darwin", type=("build", "run")) + depends_on("py-pexpect", when="platform=cray", type=("build", "run")) + depends_on("py-pickleshare", type=("build", "run")) depends_on("py-prompt-toolkit@3.0.30:3.0.36,3.0.38:3.0", when="@8.11:", type=("build", "run")) depends_on("py-prompt-toolkit@3.0.2:3.0", when="@8.5:", type=("build", "run")) depends_on("py-prompt-toolkit@2.0.0:2,3.0.2:3.0", when="@7.26:", type=("build", "run")) depends_on("py-prompt-toolkit@3.0.2:3.0", when="@7.18:7.25", type=("build", "run")) depends_on("py-prompt-toolkit@2.0.0:2.0", when="@7.5.0", type=("build", "run")) depends_on("py-prompt-toolkit@2.0.0:2", when="@7.0.0:7.5.0", type=("build", "run")) - depends_on("py-prompt-toolkit@1.0.4:1", when="@5:7.0.0", type=("build", "run")) - depends_on("py-prompt-toolkit@1.0.3:1", when="@5:7.0.0", type=("build", "run")) + depends_on("py-prompt-toolkit@1.0.4:1", when="@:7.0.0", type=("build", "run")) + depends_on("py-prompt-toolkit@1.0.3:1", when="@:7.0.0", type=("build", "run")) depends_on("py-pygments@2.4:", when="@8.1:", type=("build", "run")) - depends_on("py-pygments", when="@5:", type=("build", "run")) + depends_on("py-pygments", type=("build", "run")) depends_on("py-stack-data", when="@8:", type=("build", "run")) depends_on("py-traitlets@5:", when="@8:", type=("build", "run")) - depends_on("py-traitlets@4.2:", when="@5:", type=("build", "run")) - depends_on("py-traitlets", when="@4:", type=("build", "run")) + depends_on("py-traitlets@4.2:", type=("build", "run")) + depends_on("py-traitlets", type=("build", "run")) depends_on("py-typing-extensions", when="@8.12: ^python@:3.9", type=("build", "run")) # Historical dependencies depends_on("py-black", when="@8.0", type=("build", "run")) - depends_on("py-simplegeneric@0.8:", when="@4:7.0.0", type=("build", "run")) + depends_on("py-simplegeneric@0.8:", when="@:7.0.0", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-keras/package.py b/var/spack/repos/builtin/packages/py-keras/package.py index 718511e1ca..f96d066480 100644 --- a/var/spack/repos/builtin/packages/py-keras/package.py +++ b/var/spack/repos/builtin/packages/py-keras/package.py @@ -28,7 +28,6 @@ class PyKeras(PythonPackage): version("2.8.0", sha256="5e777b0101d8385d3a90fc9056f1b2f6313f2c830d2e8181828b300c9229ec0c") version("2.7.0", sha256="7502746467ab15184e2e267f13fbb2c3f33ba24f8e02a097d229ba376dabaa04") version("2.6.0", sha256="15586a3f3e1ed9182e6e0d4c0dbd052dfb7250e779ceb7e24f8839db5c63fcae") - version("2.5.0", commit="9c266106163390f173625c4e7b1ccb03ae145ffc", deprecated=True) version("2.4.3", sha256="fedd729b52572fb108a98e3d97e1bac10a81d3917d2103cc20ab2a5f03beb973") version("2.4.2", sha256="e26bc51b7b8fb7add452cdf6fba77d6509e6c78b9d9ef5fd32fe132c6d9182d2") version("2.4.1", sha256="e282cc9c5c996043b21d045765c0c5bf541c1879232a97a574c51af0ce132cb1") @@ -41,129 +40,12 @@ class PyKeras(PythonPackage): version("2.2.2", sha256="468d98da104ec5c3dbb10c2ef6bb345ab154f6ca2d722d4c250ef4d6105de17a") version("2.2.1", sha256="0d3cb14260a3fa2f4a5c4c9efa72226ffac3b4c50135ba6edaf2b3d1d23b11ee") version("2.2.0", sha256="5b8499d157af217f1a5ee33589e774127ebc3e266c833c22cb5afbb0ed1734bf") - version( - "2.1.6", - sha256="c14af1081242c25617ade7eb62121d58d01f16e1e744bae9fc4f1f95a417716e", - deprecated=True, - ) - version( - "2.1.5", - sha256="907ad29add1fff27342a9f4fe3e60003d450d3af41a38f22f629c7736fc8399d", - deprecated=True, - ) - version( - "2.1.4", - sha256="7ee1fcc79072ac904a4f008d715bcb78c60250ae3cd41d99e268c60ade8d0d3a", - deprecated=True, - ) - version( - "2.1.3", - sha256="7ca3a381523bad40a6922e88951a316664cb088fd01cea07e5ec8ada3327e3c7", - deprecated=True, - ) - version( - "2.1.2", - sha256="3ee56fc129d9d00b1916046e50056047836f97ada59df029e5661fb34442d5e8", - deprecated=True, - ) - version( - "2.1.1", - sha256="f0ca2458c60d9711edf4291230b31795307ad3781cb6232ff4792b53c8f55123", - deprecated=True, - ) - version( - "2.1.0", - sha256="67a0d66c20fff99312fc280e34c8f6dc3dbb027d4a33c13c79bec3c1173f6909", - deprecated=True, - ) - version( - "2.0.9", - sha256="6b8572cf1b4a22fd0120b7c23382ba4fa04a6f0397e02af1249be9a7309d1767", - deprecated=True, - ) - version( - "2.0.8", - sha256="899dc6aaed366f20100b9f80cf1093ea5b43eecc74afd1dc63a4e48dfa776ab9", - deprecated=True, - ) - version( - "2.0.7", - sha256="a6c72ee2b94be1ffefe7e77b69582b9827211f0c356b2189459711844d3634c0", - deprecated=True, - ) - version( - "2.0.6", - sha256="0519480abe4ad18b2c2d1bc580eab75edd82c95083d341a1157952f4b00019bb", - deprecated=True, - ) - version( - "2.0.5", - sha256="cbce24758530e070fe1b403d6d21391cbea78c037b70bf6afc1ca9f1f8269eff", - deprecated=True, - ) - version( - "2.0.4", - sha256="1cbe62af6821963321b275d5598fd94e63c11feaa1d4deaa79c9eb9ee0e1d68a", - deprecated=True, - ) - version( - "2.0.3", - sha256="398dbd4a95e9d3ab2b2941d3e0c19362d397a2a6c3a667ab89d3d6aad30997f4", - deprecated=True, - ) - version( - "2.0.2", - sha256="53fd0a6e9eaca2563e13d2266eac2da478fa25092de3c665aa26e380a8126841", - deprecated=True, - ) - version( - "2.0.1", - sha256="c5c2727518f76606794363c01430f4992e482b4ab0dc6a8fa137c896855c09a8", - deprecated=True, - ) - version( - "2.0.0", - sha256="02846dceb36e98368f47ca090d0f5fe6828e22ece10668a07047bea4c92b157f", - deprecated=True, - ) - version( - "1.2.2", - sha256="d2b18c4336eb9c4f0d03469870257efa7980a9b036c9d46dcf4d49e7f4487e2d", - deprecated=True, - ) - version( - "1.2.1", - sha256="6adce75b2050608e6683c3046ef938bfdc5bfcd4c6b6c522df5e50d18e0ac7c6", - deprecated=True, - ) - version( - "1.2.0", - sha256="33d5297cd0c280640dc5c075466995c05911bc1da35c83ae57b2a48188b605e2", - deprecated=True, - ) - version( - "1.1.2", - sha256="cfde0a424961ead4982a7ebefd77d8ca382810b5a69b566fa64c57d8f340eeb4", - deprecated=True, - ) - version( - "1.1.1", - sha256="be1b67f62e5119f6f24a239a865dc47e6d9aa93b97b506ba34cab7353dbc23b6", - deprecated=True, - ) - version( - "1.1.0", - sha256="36d83b027ba9d2c9da8e1eefc28f600ca93dc03423e033b633cbac9061af8a5d", - deprecated=True, - ) # Supported Python versions listed in multiple places: # * keras/tools/pip_package/setup.py # * CONTRIBUTING.md # * PKG-INFO depends_on("python@3.8:", type=("build", "run"), when="@2.12:") - depends_on("python@3.7:", type=("build", "run"), when="@2.7:") - depends_on("python@3.6:", type=("build", "run"), when="@2.4:") depends_on("py-setuptools", type="build") # Required dependencies listed in multiple places: @@ -172,13 +54,13 @@ class PyKeras(PythonPackage): depends_on("py-absl-py", type=("build", "run"), when="@2.6:") depends_on("py-h5py", type=("build", "run")) depends_on("py-numpy", type=("build", "run")) - depends_on("py-pandas", type=("build", "run"), when="@2.0.9:") + depends_on("py-pandas", type=("build", "run")) depends_on("pil", type=("build", "run")) depends_on("py-portpicker", type=("build", "run"), when="@2.10:") depends_on("py-pydot", type=("build", "run")) depends_on("py-scipy", type=("build", "run")) depends_on("py-six", type=("build", "run")) - for minor_ver in range(5, 13): + for minor_ver in range(6, 13): depends_on( "py-tensorflow@2.{}".format(minor_ver), type=("build", "run"), @@ -192,7 +74,6 @@ class PyKeras(PythonPackage): depends_on("py-pyyaml", type=("build", "run")) depends_on("bazel", type="build", when="@2.5:") depends_on("protobuf", type="build", when="@2.5:") - depends_on("py-theano", type=("build", "run"), when="@:2.0.7") def url_for_version(self, version): if version >= Version("2.6"): diff --git a/var/spack/repos/builtin/packages/py-lark-parser/package.py b/var/spack/repos/builtin/packages/py-lark-parser/package.py index ee81366697..de1417a283 100644 --- a/var/spack/repos/builtin/packages/py-lark-parser/package.py +++ b/var/spack/repos/builtin/packages/py-lark-parser/package.py @@ -13,20 +13,5 @@ class PyLarkParser(PythonPackage): pypi = "lark-parser/lark-parser-0.6.2.tar.gz" version("0.12.0", sha256="15967db1f1214013dca65b1180745047b9be457d73da224fcda3d9dd4e96a138") - version( - "0.11.3", - sha256="e29ca814a98bb0f81674617d878e5f611cb993c19ea47f22c80da3569425f9bd", - deprecated=True, - ) - version( - "0.7.1", - sha256="8455e05d062fa7f9d59a2735583cf02291545f944955c4056bf1144c4e625344", - deprecated=True, - ) - version( - "0.6.2", - sha256="7e2934371e0e3a5daf9afc2e3ddda76117cabcd3c3f2edf7987c1e4e9b9e503c", - deprecated=True, - ) depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-magic/package.py b/var/spack/repos/builtin/packages/py-magic/package.py deleted file mode 100644 index e38be53be2..0000000000 --- a/var/spack/repos/builtin/packages/py-magic/package.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyMagic(PythonPackage): - """A python wrapper for libmagic. - - .. warning:: - DO NOT USE: this is a duplicate of py-python-magic and will be deleted. - """ - - homepage = "https://github.com/ahupp/python-magic" - url = "https://github.com/ahupp/python-magic/archive/0.4.15.tar.gz" - - version( - "0.4.15", - sha256="6d730389249ab1e34ffb0a3c5beaa44e116687ffa081e0176dab6c59ff271593", - deprecated=True, - ) - - depends_on("python@2.7.0:2.7,3.5:", type=("build", "run")) - depends_on("py-setuptools", type="build") - depends_on("file", type="run") diff --git a/var/spack/repos/builtin/packages/py-metpy/package.py b/var/spack/repos/builtin/packages/py-metpy/package.py index 88db214a0c..0459649eef 100644 --- a/var/spack/repos/builtin/packages/py-metpy/package.py +++ b/var/spack/repos/builtin/packages/py-metpy/package.py @@ -19,11 +19,6 @@ class PyMetpy(PythonPackage): import_modules = ["metpy", "metpy._vendor", "metpy.calc", "metpy.interpolate"] version("1.0.1", sha256="16fa9806facc24f31f454b898741ec5639a72ba9d4ff8a19ad0e94629d93cb95") - version( - "1.0", - sha256="11b043aaa4e3d35db319e96bb9967eb9f73da653e155bca2d62f838108b100dc", - deprecated=True, - ) depends_on("python@3.6:", type=("build", "run")) depends_on("py-setuptools", type="build") @@ -32,8 +27,7 @@ class PyMetpy(PythonPackage): depends_on("py-importlib-resources@1.3.0:", when="^python@:3.8", type=("build", "run")) depends_on("py-matplotlib@2.1.0:", type=("build", "run")) depends_on("py-numpy@1.16.0:", type=("build", "run")) - depends_on("py-pandas@0.22.0:", when="@1.0", type=("build", "run")) - depends_on("py-pandas@0.24.0:", when="@1.0.1", type=("build", "run")) + depends_on("py-pandas@0.24.0:", type=("build", "run")) depends_on("py-pint@0.10.1:", type=("build", "run")) depends_on("py-pooch@0.1:", type=("build", "run")) depends_on("py-pyproj@2.3.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-onnx-runtime/cms.patch b/var/spack/repos/builtin/packages/py-onnx-runtime/cms.patch deleted file mode 100644 index ebe626c4d7..0000000000 --- a/var/spack/repos/builtin/packages/py-onnx-runtime/cms.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff -ur a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt ---- a/cmake/CMakeLists.txt 2021-12-14 22:34:21.754062247 +0100 -+++ b/cmake/CMakeLists.txt 2021-12-14 22:36:18.094061909 +0100 -@@ -240,7 +240,7 @@ - if (onnxruntime_MINIMAL_BUILD_CUSTOM_OPS) - add_compile_definitions(ORT_MINIMAL_BUILD_CUSTOM_OPS) - endif() -- -+ - set(onnxruntime_REDUCED_OPS_BUILD ON) - - if (NOT onnxruntime_ENABLE_PYTHON) -@@ -568,7 +568,7 @@ - endif() - endif() - --if(NOT WIN32 AND NOT onnxruntime_PREFER_SYSTEM_LIB) -+if(NOT WIN32) - add_subdirectory(${PROJECT_SOURCE_DIR}/external/nsync EXCLUDE_FROM_ALL) - endif() - # External dependencies -@@ -596,7 +596,7 @@ - if(NOT Protobuf_USE_STATIC_LIBS) - #Indeed here should be a warning, not a fatal error. ONNX Runtime itself can work in such a - #setting but it may cause compatibility issue when ONNX Runtime is integrated with the other ONNX ecosystem softwares. -- message(FATAL_ERROR "Please enable Protobuf_USE_STATIC_LIBS") -+ message(WARNING "Please enable Protobuf_USE_STATIC_LIBS") - endif() - else() - set(PROTOBUF_LIB protobuf::libprotobuf-lite) -diff -ur a/include/onnxruntime/core/platform/ort_mutex.h b/include/onnxruntime/core/platform/ort_mutex.h ---- a/include/onnxruntime/core/platform/ort_mutex.h 2021-12-14 22:34:21.784062247 +0100 -+++ b/include/onnxruntime/core/platform/ort_mutex.h 2021-12-14 22:36:18.164061909 +0100 -@@ -101,7 +101,7 @@ - return steady_clock::now() - steady_now < rel_time ? std::cv_status::no_timeout : std::cv_status::timeout; - } - } // namespace onnxruntime --#else -+#elif !defined(__aarch64__) - #include "nsync.h" - #include <mutex> //for unique_lock - #include <condition_variable> //for cv_status -@@ -186,4 +186,11 @@ - return steady_clock::now() - steady_now < rel_time ? std::cv_status::no_timeout : std::cv_status::timeout; - } - }; // namespace onnxruntime -+#else -+#include <mutex> -+#include <condition_variable> -+namespace onnxruntime { -+using OrtMutex = std::mutex; -+using OrtCondVar = std::condition_variable; -+} // namespace onnxruntime - #endif -diff -ur a/include/onnxruntime/core/session/onnxruntime_cxx_api.h b/include/onnxruntime/core/session/onnxruntime_cxx_api.h ---- a/include/onnxruntime/core/session/onnxruntime_cxx_api.h 2021-12-14 22:34:21.784062247 +0100 -+++ b/include/onnxruntime/core/session/onnxruntime_cxx_api.h 2021-12-14 22:36:18.164061909 +0100 -@@ -345,8 +345,8 @@ - - struct Session : Base<OrtSession> { - explicit Session(std::nullptr_t) {} -- Session(Env& env, const ORTCHAR_T* model_path, const SessionOptions& options); -- Session(Env& env, const void* model_data, size_t model_data_length, const SessionOptions& options); -+ Session(const Env& env, const ORTCHAR_T* model_path, const SessionOptions& options); -+ Session(const Env& env, const void* model_data, size_t model_data_length, const SessionOptions& options); - - // Run that will allocate the output values - std::vector<Value> Run(const RunOptions& run_options, const char* const* input_names, const Value* input_values, size_t input_count, -diff -ur a/include/onnxruntime/core/session/onnxruntime_cxx_inline.h b/include/onnxruntime/core/session/onnxruntime_cxx_inline.h ---- a/include/onnxruntime/core/session/onnxruntime_cxx_inline.h 2021-12-14 22:34:21.784062247 +0100 -+++ b/include/onnxruntime/core/session/onnxruntime_cxx_inline.h 2021-12-14 22:36:18.164061909 +0100 -@@ -500,11 +500,11 @@ - return *this; - } - --inline Session::Session(Env& env, const ORTCHAR_T* model_path, const SessionOptions& options) { -+inline Session::Session(const Env& env, const ORTCHAR_T* model_path, const SessionOptions& options) { - ThrowOnError(GetApi().CreateSession(env, model_path, options, &p_)); - } - --inline Session::Session(Env& env, const void* model_data, size_t model_data_length, const SessionOptions& options) { -+inline Session::Session(const Env& env, const void* model_data, size_t model_data_length, const SessionOptions& options) { - ThrowOnError(GetApi().CreateSessionFromArray(env, model_data, model_data_length, options, &p_)); - } - -diff -ur a/onnxruntime/core/mlas/lib/platform.cpp b/onnxruntime/core/mlas/lib/platform.cpp ---- a/onnxruntime/core/mlas/lib/platform.cpp 2021-12-14 22:34:21.864062247 +0100 -+++ b/onnxruntime/core/mlas/lib/platform.cpp 2021-12-14 22:36:18.244061908 +0100 -@@ -16,6 +16,7 @@ - --*/ - - #include "mlasi.h" -+#include <string> - - // - // Stores the platform information. -@@ -170,8 +171,11 @@ - // - - uint64_t xcr0 = MlasReadExtendedControlRegister(_XCR_XFEATURE_ENABLED_MASK); -+ const char *cpu_opt = std::getenv("MLAS_DYNAMIC_CPU_ARCH"); -+ if (cpu_opt == nullptr) cpu_opt = "99"; -+ auto opt = std::stoi(cpu_opt); - -- if ((xcr0 & 0x6) == 0x6) { -+ if (opt > 0 && (xcr0 & 0x6) == 0x6) { - - this->GemmFloatKernel = MlasGemmFloatKernelAvx; - -@@ -204,7 +208,7 @@ - __cpuid_count(7, 0, Cpuid7[0], Cpuid7[1], Cpuid7[2], Cpuid7[3]); - #endif - -- if (((Cpuid1[2] & 0x1000) != 0) && ((Cpuid7[1] & 0x20) != 0)) { -+ if (opt > 1 && ((Cpuid1[2] & 0x1000) != 0) && ((Cpuid7[1] & 0x20) != 0)) { - - this->GemmU8S8Operation = MlasGemmU8X8Operation<MLAS_GEMM_U8S8_KERNEL_AVX2>; - this->GemmU8S8PackedOperation = MlasGemmU8X8PackedOperation<MLAS_GEMM_U8S8_KERNEL_AVX2>; -@@ -264,7 +268,7 @@ - // operating system supports saving AVX512F state. - // - -- if (((Cpuid7[1] & 0x10000) != 0) && ((xcr0 & 0xE0) == 0xE0)) { -+ if (opt > 2 && ((Cpuid7[1] & 0x10000) != 0) && ((xcr0 & 0xE0) == 0xE0)) { - - this->GemmFloatKernel = MlasGemmFloatKernelAvx512F; - this->GemmDoubleKernel = MlasGemmDoubleKernelAvx512F; -diff -ur a/onnxruntime/core/platform/posix/ort_mutex.cc b/onnxruntime/core/platform/posix/ort_mutex.cc ---- a/onnxruntime/core/platform/posix/ort_mutex.cc 2021-12-14 22:34:21.874062247 +0100 -+++ b/onnxruntime/core/platform/posix/ort_mutex.cc 2021-12-14 22:36:18.254061908 +0100 -@@ -1,6 +1,7 @@ - // Copyright (c) Microsoft Corporation. All rights reserved. - // Licensed under the MIT License. - -+#if !defined(__aarch64__) - #include "core/common/common.h" - #include "core/platform/ort_mutex.h" - #include <assert.h> -@@ -40,4 +41,5 @@ - nsync::nsync_cv_wait(&native_cv_object, lk.mutex()->native_handle()); - } - --} // namespace onnxruntime -\ No newline at end of file -+} // namespace onnxruntime -+#endif diff --git a/var/spack/repos/builtin/packages/py-onnx-runtime/cms_1_10.patch b/var/spack/repos/builtin/packages/py-onnx-runtime/cms_1_10.patch deleted file mode 100644 index 3365fb75e2..0000000000 --- a/var/spack/repos/builtin/packages/py-onnx-runtime/cms_1_10.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index acbde7f56a8..eb9f7bb9fbf 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -718,7 +718,7 @@ if (onnxruntime_BUILD_BENCHMARKS) - endif() - endif() - --if (NOT WIN32 AND NOT onnxruntime_PREFER_SYSTEM_LIB) -+if (NOT WIN32) - add_subdirectory(${PROJECT_SOURCE_DIR}/external/nsync EXCLUDE_FROM_ALL) - endif() - # External dependencies -diff --git a/include/onnxruntime/core/platform/ort_mutex.h b/include/onnxruntime/core/platform/ort_mutex.h -index e24665f5142..ddc11953fbc 100644 ---- a/include/onnxruntime/core/platform/ort_mutex.h -+++ b/include/onnxruntime/core/platform/ort_mutex.h -@@ -101,7 +101,7 @@ std::cv_status OrtCondVar::wait_for(std::unique_lock<OrtMutex>& cond_mutex, - return steady_clock::now() - steady_now < rel_time ? std::cv_status::no_timeout : std::cv_status::timeout; - } - } // namespace onnxruntime --#else -+#elif !defined(__aarch64__) - #include "nsync.h" - #include <mutex> //for unique_lock - #include <condition_variable> //for cv_status -@@ -186,4 +186,11 @@ std::cv_status OrtCondVar::wait_for(std::unique_lock<OrtMutex>& cond_mutex, - return steady_clock::now() - steady_now < rel_time ? std::cv_status::no_timeout : std::cv_status::timeout; - } - }; // namespace onnxruntime -+#else -+#include <mutex> -+#include <condition_variable> -+namespace onnxruntime { -+using OrtMutex = std::mutex; -+using OrtCondVar = std::condition_variable; -+} // namespace onnxruntime - #endif -diff --git a/include/onnxruntime/core/session/onnxruntime_cxx_api.h b/include/onnxruntime/core/session/onnxruntime_cxx_api.h -index 048421099bd..4430185d496 100644 ---- a/include/onnxruntime/core/session/onnxruntime_cxx_api.h -+++ b/include/onnxruntime/core/session/onnxruntime_cxx_api.h -@@ -379,9 +379,9 @@ struct ModelMetadata : Base<OrtModelMetadata> { - */ - struct Session : Base<OrtSession> { - explicit Session(std::nullptr_t) {} ///< Create an empty Session object, must be assigned a valid one to be used -- Session(Env& env, const ORTCHAR_T* model_path, const SessionOptions& options); ///< Wraps OrtApi::CreateSession -- Session(Env& env, const ORTCHAR_T* model_path, const SessionOptions& options, OrtPrepackedWeightsContainer* prepacked_weights_container); ///< Wraps OrtApi::CreateSessionWithPrepackedWeightsContainer -- Session(Env& env, const void* model_data, size_t model_data_length, const SessionOptions& options); ///< Wraps OrtApi::CreateSessionFromArray -+ Session(const Env& env, const ORTCHAR_T* model_path, const SessionOptions& options); ///< Wraps OrtApi::CreateSession -+ Session(const Env& env, const ORTCHAR_T* model_path, const SessionOptions& options, OrtPrepackedWeightsContainer* prepacked_weights_container); ///< Wraps OrtApi::CreateSessionWithPrepackedWeightsContainer -+ Session(const Env& env, const void* model_data, size_t model_data_length, const SessionOptions& options); ///< Wraps OrtApi::CreateSessionFromArray - - /** \brief Run the model returning results in an Ort allocated vector. - * -diff --git a/include/onnxruntime/core/session/onnxruntime_cxx_inline.h b/include/onnxruntime/core/session/onnxruntime_cxx_inline.h -index 1f31dffca87..b9d2cdfc475 100644 ---- a/include/onnxruntime/core/session/onnxruntime_cxx_inline.h -+++ b/include/onnxruntime/core/session/onnxruntime_cxx_inline.h -@@ -538,16 +538,16 @@ inline SessionOptions& SessionOptions::AppendExecutionProvider_OpenVINO(const Or - return *this; - } - --inline Session::Session(Env& env, const ORTCHAR_T* model_path, const SessionOptions& options) { -+inline Session::Session(const Env& env, const ORTCHAR_T* model_path, const SessionOptions& options) { - ThrowOnError(GetApi().CreateSession(env, model_path, options, &p_)); - } - --inline Session::Session(Env& env, const ORTCHAR_T* model_path, const SessionOptions& options, -+inline Session::Session(const Env& env, const ORTCHAR_T* model_path, const SessionOptions& options, - OrtPrepackedWeightsContainer* prepacked_weights_container) { - ThrowOnError(GetApi().CreateSessionWithPrepackedWeightsContainer(env, model_path, options, prepacked_weights_container, &p_)); - } - --inline Session::Session(Env& env, const void* model_data, size_t model_data_length, const SessionOptions& options) { -+inline Session::Session(const Env& env, const void* model_data, size_t model_data_length, const SessionOptions& options) { - ThrowOnError(GetApi().CreateSessionFromArray(env, model_data, model_data_length, options, &p_)); - } - -diff --git a/onnxruntime/core/mlas/lib/platform.cpp b/onnxruntime/core/mlas/lib/platform.cpp -index de7fee8c07a..6d97cf07a05 100644 ---- a/onnxruntime/core/mlas/lib/platform.cpp -+++ b/onnxruntime/core/mlas/lib/platform.cpp -@@ -16,6 +16,7 @@ Module Name: - --*/ - - #include "mlasi.h" -+#include <string> - - #if defined(MLAS_TARGET_POWER) && defined(__linux__) - #include <sys/auxv.h> -@@ -197,8 +198,11 @@ Return Value: - // - - uint64_t xcr0 = MlasReadExtendedControlRegister(_XCR_XFEATURE_ENABLED_MASK); -+ const char *cpu_opt = std::getenv("MLAS_DYNAMIC_CPU_ARCH"); -+ if (cpu_opt == nullptr) cpu_opt = "99"; -+ auto opt = std::stoi(cpu_opt); - -- if ((xcr0 & 0x6) == 0x6) { -+ if (opt > 0 && (xcr0 & 0x6) == 0x6) { - - this->GemmFloatKernel = MlasGemmFloatKernelAvx; - -@@ -231,7 +235,7 @@ Return Value: - __cpuid_count(7, 0, Cpuid7[0], Cpuid7[1], Cpuid7[2], Cpuid7[3]); - #endif - -- if (((Cpuid1[2] & 0x1000) != 0) && ((Cpuid7[1] & 0x20) != 0)) { -+ if (opt > 1 && ((Cpuid1[2] & 0x1000) != 0) && ((Cpuid7[1] & 0x20) != 0)) { - - this->GemmU8S8Dispatch = &MlasGemmU8S8DispatchAvx2; - this->GemmU8S8Kernel = MlasGemmU8S8KernelAvx2; -@@ -290,7 +294,7 @@ Return Value: - // operating system supports saving AVX512F state. - // - -- if (((Cpuid7[1] & 0x10000) != 0) && ((xcr0 & 0xE0) == 0xE0)) { -+ if (opt > 2 && ((Cpuid7[1] & 0x10000) != 0) && ((xcr0 & 0xE0) == 0xE0)) { - - this->GemmFloatKernel = MlasGemmFloatKernelAvx512F; - this->GemmDoubleKernel = MlasGemmDoubleKernelAvx512F; -diff --git a/onnxruntime/core/platform/posix/ort_mutex.cc b/onnxruntime/core/platform/posix/ort_mutex.cc -index 8a5d41eb360..89111c9daa5 100644 ---- a/onnxruntime/core/platform/posix/ort_mutex.cc -+++ b/onnxruntime/core/platform/posix/ort_mutex.cc -@@ -1,6 +1,7 @@ - // Copyright (c) Microsoft Corporation. All rights reserved. - // Licensed under the MIT License. - -+#if !defined(__aarch64__) - #include "core/common/common.h" - #include "core/platform/ort_mutex.h" - #include <assert.h> -@@ -40,4 +41,5 @@ void OrtCondVar::wait(std::unique_lock<OrtMutex>& lk) { - nsync::nsync_cv_wait(&native_cv_object, lk.mutex()->native_handle()); - } - --} // namespace onnxruntime -\ No newline at end of file -+} // namespace onnxruntime -+#endif diff --git a/var/spack/repos/builtin/packages/py-onnx-runtime/gcc11.patch b/var/spack/repos/builtin/packages/py-onnx-runtime/gcc11.patch deleted file mode 100644 index b53cc1dc6d..0000000000 --- a/var/spack/repos/builtin/packages/py-onnx-runtime/gcc11.patch +++ /dev/null @@ -1,36 +0,0 @@ -From de4089f8cbe0baffe56a363cc3a41595cc8f0809 Mon Sep 17 00:00:00 2001 -From: ankurverma85 <31362771+ankurverma85@users.noreply.github.com> -Date: Mon, 10 May 2021 12:50:08 -0700 -Subject: [PATCH] GCC11/Libstdc++11 Compilation fixes (#7599) - -Authored-by: Ankur Verma <ankurv@microsoft.com> ---- - include/onnxruntime/core/graph/graph_nodes.h | 2 +- - onnxruntime/test/providers/cpu/controlflow/loop_test.cc | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/onnxruntime/core/graph/graph_nodes.h b/include/onnxruntime/core/graph/graph_nodes.h -index 422fe9538ea..aec603f7942 100644 ---- a/include/onnxruntime/core/graph/graph_nodes.h -+++ b/include/onnxruntime/core/graph/graph_nodes.h -@@ -100,7 +100,7 @@ class ValidNodes { - using const_reference = const T&; - - /** Construct a NodeInterator and move to the first valid node. */ -- NodeIterator<TIterator>(const TIterator current, const TIterator end, const NodeFilterFunc& filter_fn) noexcept -+ NodeIterator(const TIterator current, const TIterator end, const NodeFilterFunc& filter_fn) noexcept - : current_{current}, end_{end}, apply_filter_{filter_fn != nullptr}, filter_func_{&filter_fn} { - // skip to next valid node, stopping at end if none are found - while (current_ < end && (*current_ == nullptr || -diff --git a/onnxruntime/test/providers/cpu/controlflow/loop_test.cc b/onnxruntime/test/providers/cpu/controlflow/loop_test.cc -index b058e9a16c7..3cf147e997c 100644 ---- a/onnxruntime/test/providers/cpu/controlflow/loop_test.cc -+++ b/onnxruntime/test/providers/cpu/controlflow/loop_test.cc -@@ -2,6 +2,7 @@ - // Licensed under the MIT License. - - #include <future> -+#include <thread> - #include "gtest/gtest.h" - #include "gmock/gmock.h" - diff --git a/var/spack/repos/builtin/packages/py-onnx-runtime/libiconv-1.10.patch b/var/spack/repos/builtin/packages/py-onnx-runtime/libiconv-1.10.patch deleted file mode 100644 index 446f263ebd..0000000000 --- a/var/spack/repos/builtin/packages/py-onnx-runtime/libiconv-1.10.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- cmake/onnxruntime.cmake.orig 2022-10-07 16:39:05.935164330 +0200 -+++ cmake/onnxruntime.cmake 2022-10-07 16:39:56.702750071 +0200 -@@ -195,6 +195,7 @@ - target_link_libraries(onnxruntime PRIVATE - ${onnxruntime_INTERNAL_LIBRARIES} - ${onnxruntime_EXTERNAL_LIBRARIES} -+ -liconv - ) - - set_property(TARGET onnxruntime APPEND_STRING PROPERTY LINK_FLAGS ${ONNXRUNTIME_SO_LINK_FLAG} ${onnxruntime_DELAYLOAD_FLAGS}) ---- cmake/onnxruntime_python.cmake.orig 2022-10-07 16:40:36.134428297 +0200 -+++ cmake/onnxruntime_python.cmake 2022-10-07 16:40:46.916340311 +0200 -@@ -156,6 +156,7 @@ - onnxruntime_common - onnxruntime_flatbuffers - ${pybind11_lib} -+ -liconv - ) - - if (onnxruntime_ENABLE_LANGUAGE_INTEROP_OPS) ---- cmake/onnxruntime_unittests.cmake.orig 2022-10-07 16:41:33.413960900 +0200 -+++ cmake/onnxruntime_unittests.cmake 2022-10-07 16:42:35.780451977 +0200 -@@ -664,7 +664,7 @@ - SOURCES ${all_tests} ${onnxruntime_unittest_main_src} - LIBS - onnx_test_runner_common ${onnxruntime_test_providers_libs} ${onnxruntime_test_common_libs} -- onnx_test_data_proto nlohmann_json::nlohmann_json -+ onnx_test_data_proto nlohmann_json::nlohmann_json -liconv - DEPENDS ${all_dependencies} - ) - if(NOT MSVC) -@@ -790,7 +790,7 @@ - ) - endif() - --target_link_libraries(onnx_test_runner PRIVATE onnx_test_runner_common ${GETOPT_LIB_WIDE} ${onnx_test_libs}) -+target_link_libraries(onnx_test_runner PRIVATE onnx_test_runner_common ${GETOPT_LIB_WIDE} ${onnx_test_libs} -liconv) - target_include_directories(onnx_test_runner PRIVATE ${ONNXRUNTIME_ROOT}) - if (onnxruntime_USE_ROCM) - target_include_directories(onnx_test_runner PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/amdgpu/onnxruntime ${CMAKE_CURRENT_BINARY_DIR}/amdgpu/orttraining) diff --git a/var/spack/repos/builtin/packages/py-onnx-runtime/libiconv.patch b/var/spack/repos/builtin/packages/py-onnx-runtime/libiconv.patch deleted file mode 100644 index b782c15ed1..0000000000 --- a/var/spack/repos/builtin/packages/py-onnx-runtime/libiconv.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- cmake/onnxruntime.cmake.orig 2021-08-06 12:36:32.720081500 +0200 -+++ cmake/onnxruntime.cmake 2021-08-13 18:53:30.310868700 +0200 -@@ -120,7 +120,8 @@ - onnxruntime_common - onnxruntime_mlas - onnxruntime_flatbuffers -- ${onnxruntime_EXTERNAL_LIBRARIES}) -+ ${onnxruntime_EXTERNAL_LIBRARIES} -+ -liconv) - - if (onnxruntime_ENABLE_LANGUAGE_INTEROP_OPS) - target_link_libraries(onnxruntime PRIVATE onnxruntime_language_interop onnxruntime_pyop) ---- cmake/onnxruntime_python.cmake.orig 2021-08-06 12:36:32.725148600 +0200 -+++ cmake/onnxruntime_python.cmake 2021-08-13 18:54:37.085622000 +0200 -@@ -106,6 +106,7 @@ - onnxruntime_mlas - onnxruntime_flatbuffers - ${pybind11_lib} -+ -liconv - ) - - if (onnxruntime_ENABLE_LANGUAGE_INTEROP_OPS) ---- cmake/onnxruntime_unittests.cmake.orig 2021-08-13 19:11:58.645461300 +0200 -+++ cmake/onnxruntime_unittests.cmake 2021-08-13 19:14:18.373814800 +0200 -@@ -603,7 +603,7 @@ - AddTest( - TARGET onnxruntime_test_all - SOURCES ${all_tests} ${onnxruntime_unittest_main_src} -- LIBS onnx_test_runner_common ${onnxruntime_test_providers_libs} ${onnxruntime_test_common_libs} re2::re2 onnx_test_data_proto -+ LIBS onnx_test_runner_common ${onnxruntime_test_providers_libs} ${onnxruntime_test_common_libs} re2::re2 onnx_test_data_proto -liconv - DEPENDS ${all_dependencies} - ) - -@@ -723,7 +723,7 @@ - target_compile_options(onnx_test_runner PRIVATE "$<$<COMPILE_LANGUAGE:CUDA>:SHELL:--compiler-options /utf-8>" - "$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:/utf-8>") - endif() --target_link_libraries(onnx_test_runner PRIVATE onnx_test_runner_common ${GETOPT_LIB_WIDE} ${onnx_test_libs}) -+target_link_libraries(onnx_test_runner PRIVATE onnx_test_runner_common ${GETOPT_LIB_WIDE} ${onnx_test_libs} -liconv) - target_include_directories(onnx_test_runner PRIVATE ${ONNXRUNTIME_ROOT}) - set_target_properties(onnx_test_runner PROPERTIES FOLDER "ONNXRuntimeTest") - diff --git a/var/spack/repos/builtin/packages/py-onnx-runtime/package.py b/var/spack/repos/builtin/packages/py-onnx-runtime/package.py deleted file mode 100644 index 349f564d86..0000000000 --- a/var/spack/repos/builtin/packages/py-onnx-runtime/package.py +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyOnnxRuntime(CMakePackage, PythonExtension): - """ONNX Runtime is a performance-focused complete scoring - engine for Open Neural Network Exchange (ONNX) models, with - an open extensible architecture to continually address the - latest developments in AI and Deep Learning. ONNX Runtime - stays up to date with the ONNX standard with complete - implementation of all ONNX operators, and supports all - ONNX releases (1.2+) with both future and backwards - compatibility. - - Deprecated in favor of py-onnxruntime. - """ - - homepage = "https://github.com/microsoft/onnxruntime" - git = "https://github.com/microsoft/onnxruntime.git" - - version("1.10.0", tag="v1.10.0", submodules=True, deprecated=True) - version("1.7.2", tag="v1.7.2", submodules=True, deprecated=True) - - variant("cuda", default=False, description="Build with CUDA support") - - depends_on("cmake@3.1:", type="build") - depends_on("python", type=("build", "run")) - depends_on("py-pip", type="build") - depends_on("protobuf") - # https://github.com/microsoft/onnxruntime/pull/11639 - depends_on("protobuf@:3.19", when="@:1.11") - depends_on("py-protobuf", type=("build", "run")) - depends_on("py-setuptools", type="build") - depends_on("py-numpy@1.16.6:", type=("build", "run")) - depends_on("py-sympy@1.1:", type=("build", "run")) - depends_on("py-packaging", type=("build", "run")) - depends_on("py-cerberus", type=("build", "run")) - depends_on("py-wheel", type="build") - depends_on("py-onnx", type=("build", "run")) - depends_on("py-flatbuffers", type=("build", "run")) - depends_on("zlib") - depends_on("libpng") - depends_on("py-pybind11", type="build") - depends_on("cuda", when="+cuda") - depends_on("cudnn", when="+cuda") - depends_on("iconv", type=("build", "link", "run")) - depends_on("re2+shared") - - extends("python") - # Adopted from CMS experiment's fork of onnxruntime - # https://github.com/cms-externals/onnxruntime/compare/5bc92df...d594f80 - patch("cms.patch", level=1, when="@1.7.2") - # https://github.com/cms-externals/onnxruntime/compare/0d9030e...7a6355a - patch("cms_1_10.patch", whe="@1.10") - # https://github.com/microsoft/onnxruntime/issues/4234#issuecomment-698077636 - # only needed when iconv is provided by libiconv - patch("libiconv.patch", level=0, when="@1.7.2 ^libiconv") - patch("libiconv-1.10.patch", level=0, when="@1.10.0 ^libiconv") - # https://github.com/microsoft/onnxruntime/commit/de4089f8cbe0baffe56a363cc3a41595cc8f0809.patch - patch("gcc11.patch", level=1, when="@1.7.2") - - dynamic_cpu_arch_values = ("NOAVX", "AVX", "AVX2", "AVX512") - - variant( - "dynamic_cpu_arch", - default="AVX512", - values=dynamic_cpu_arch_values, - multi=False, - description="AVX support level", - ) - - generator("ninja") - root_cmakelists_dir = "cmake" - build_directory = "." - - def setup_build_environment(self, env): - value = self.spec.variants["dynamic_cpu_arch"].value - value = self.dynamic_cpu_arch_values.index(value) - env.set("MLAS_DYNAMIC_CPU_ARCH", str(value)) - - def setup_run_environment(self, env): - value = self.spec.variants["dynamic_cpu_arch"].value - value = self.dynamic_cpu_arch_values.index(value) - env.set("MLAS_DYNAMIC_CPU_ARCH", str(value)) - - def cmake_args(self): - define = self.define - define_from_variant = self.define_from_variant - - args = [ - define("onnxruntime_ENABLE_PYTHON", True), - define("onnxruntime_BUILD_SHARED_LIB", True), - define_from_variant("onnxruntime_USE_CUDA", "cuda"), - define("onnxruntime_BUILD_CSHARP", False), - define("onnxruntime_USE_EIGEN_FOR_BLAS", True), - define("onnxruntime_USE_OPENBLAS", False), - define("onnxruntime_USE_MKLML", False), - define("onnxruntime_USE_NGRAPH", False), - define("onnxruntime_USE_OPENMP", False), - define("onnxruntime_USE_TVM", False), - define("onnxruntime_USE_LLVM", False), - define("onnxruntime_ENABLE_MICROSOFT_INTERNAL", False), - define("onnxruntime_USE_BRAINSLICE", False), - define("onnxruntime_USE_NUPHAR", False), - define("onnxruntime_USE_TENSORRT", False), - define("onnxruntime_CROSS_COMPILING", False), - define("onnxruntime_USE_FULL_PROTOBUF", True), - define("onnxruntime_DISABLE_CONTRIB_OPS", False), - define("onnxruntime_USE_PREINSTALLED_PROTOBUF", True), - define("onnxruntime_PREFER_SYSTEM_LIB", True), - ] - - if self.spec.satisfies("+cuda"): - args.extend( - ( - define("onnxruntime_CUDA_VERSION", str(self.spec["cuda"].version)), - define("onnxruntime_CUDA_HOME", self.spec["cuda"].prefix), - define("onnxruntime_CUDNN_HOME", self.spec["cudnn"].prefix), - define("CMAKE_CUDA_FLAGS", "-cudart shared"), - define("CMAKE_CUDA_RUNTIME_LIBRARY", "Shared"), - define("DCMAKE_TRY_COMPILE_PLATFORM_VARIABLES", "CMAKE_CUDA_RUNTIME_LIBRARY"), - ) - ) - - return args - - @run_after("install") - def install_python(self): - """Install everything from build directory.""" - args = std_pip_args + ["--prefix=" + prefix, "."] - with working_dir(self.build_directory): - pip(*args) diff --git a/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py b/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py index 35885e5da1..e9edf6e110 100644 --- a/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py +++ b/var/spack/repos/builtin/packages/py-pennylane-lightning/package.py @@ -19,11 +19,6 @@ class PyPennylaneLightning(CMakePackage, PythonExtension): version("master", branch="master") version("0.30.0", sha256="0f4032409d20d00991b5d14fe0b2b928baca4a13c5a1b16eab91f61f9273e58d") version("0.29.0", sha256="da9912f0286d1a54051cc19cf8bdbdcd732795636274c95f376db72a88e52d85") - version( - "0.28.0", - sha256="f5849c2affb5fb57aca20feb40ca829d171b07db2304fde0a37c2332c5b09e18", - deprecated=True, - ) # on Spack v0.19.0 variant("blas", default=True, description="Build with BLAS support") variant( diff --git a/var/spack/repos/builtin/packages/py-pennylane/package.py b/var/spack/repos/builtin/packages/py-pennylane/package.py index 8d239e0676..f9b31ad4a8 100644 --- a/var/spack/repos/builtin/packages/py-pennylane/package.py +++ b/var/spack/repos/builtin/packages/py-pennylane/package.py @@ -19,11 +19,6 @@ class PyPennylane(PythonPackage): version("master", branch="master") version("0.30.0", sha256="7fe4821fbc733e3e40d7011e054bd2e31edde3151fd9539025c827a5a3579d6b") version("0.29.1", sha256="6ecfb305a3898347df8c539a89a67e748766941d159dbef9e34864872f13c45c") - version( - "0.28.0", - sha256="7736a17dc972d918e3a737ce4360d16ac84b9f9f6fca440f167de579c926c114", - deprecated=True, - ) depends_on("python@3.8:", type=("build", "run")) depends_on("py-pip", type=("build", "run")) # Runtime req for pennylane.about() diff --git a/var/spack/repos/builtin/packages/py-pycodestyle/package.py b/var/spack/repos/builtin/packages/py-pycodestyle/package.py index b4e932b300..683d0728cd 100644 --- a/var/spack/repos/builtin/packages/py-pycodestyle/package.py +++ b/var/spack/repos/builtin/packages/py-pycodestyle/package.py @@ -25,60 +25,7 @@ class PyPycodestyle(PythonPackage): version("2.2.0", sha256="df81dc3293e0123e2e8d1f2aaf819600e4ae287d8b3af8b72181af50257e5d9a") version("2.1.0", sha256="5b540e4f19b4938c082cfd13f5d778d1ad2308b337abbc687ab9335233f5f3e2") version("2.0.0", sha256="37f0420b14630b0eaaf452978f3a6ea4816d787c3e6dcbba6fb255030adae2e7") - # Versions below 2.0.0 are not on pypi - version( - "1.7.0", - sha256="3f62d19b5cbcbdcb7810f967dcc2fbdd090256e090c32b457e2580a841d118ef", - url="https://github.com/PyCQA/pycodestyle/archive/1.7.0.tar.gz", - deprecated=True, - ) - version( - "1.6.2", - sha256="508bfd7d457046891bf4b8fbfc95ccac7995c37cdfdb3daf97bfeb7a13fa4c9c", - url="https://github.com/PyCQA/pycodestyle/archive/1.6.2.tar.gz", - deprecated=True, - ) - version( - "1.6.1", - sha256="3a910a0d0d998d4c3c2b8152a4816b98938b27cc73a4433c61202449706a73c8", - url="https://github.com/PyCQA/pycodestyle/archive/1.6.1.tar.gz", - deprecated=True, - ) - version( - "1.6", - sha256="5e7bb5156af311079345b5e81f8154c3e1420d723150a6cba5a70245eb0d515a", - url="https://github.com/PyCQA/pycodestyle/archive/1.6.tar.gz", - deprecated=True, - ) - version( - "1.5.7", - sha256="9bf020638986f2e254823aee62cfd97e55ba08ad51503cd5ae26172c47f48401", - url="https://github.com/PyCQA/pycodestyle/archive/1.5.7.tar.gz", - deprecated=True, - ) - version( - "1.5.6", - sha256="9f164c1211854678b2cb269954bc8aac2dcfa142d40c99f7bab08f9344cf3241", - url="https://github.com/PyCQA/pycodestyle/archive/1.5.6.tar.gz", - deprecated=True, - ) - version( - "1.5.5", - sha256="e55204c5477a29eb094835ad6e83be292aa3e06be12e51f5b4cc67f38d0d61ba", - url="https://github.com/PyCQA/pycodestyle/archive/1.5.5.tar.gz", - deprecated=True, - ) - version( - "1.5.4", - sha256="bc234f7935a350c79c953421b01163db01010f39caeddfa8602ff54f76a6fd9e", - url="https://github.com/PyCQA/pycodestyle/archive/1.5.4.tar.gz", - deprecated=True, - ) # Most Python packages only require py-setuptools as a build dependency. # However, py-pycodestyle requires py-setuptools during runtime as well. depends_on("py-setuptools", type=("build", "run")) - - depends_on("python@3.6:", when="@2.9:", type=("build", "run")) - depends_on("python@2.7:2.8,3.5:", when="@2.8", type=("build", "run")) - depends_on("python@2.7:2.8,3.4:", when="@2.7", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-radical-utils/package.py b/var/spack/repos/builtin/packages/py-radical-utils/package.py index 735d2deefa..5d8e04f3da 100644 --- a/var/spack/repos/builtin/packages/py-radical-utils/package.py +++ b/var/spack/repos/builtin/packages/py-radical-utils/package.py @@ -32,17 +32,6 @@ class PyRadicalUtils(PythonPackage): version("1.8.0", sha256="8582c65593f51d394fc263c6354ec5ad9cc7173369dcedfb2eef4f5e8146cf03") version("1.6.7", sha256="552f6c282f960ccd9d2401d686b0b3bfab35dfa94a26baeb2d3b4e45211f05a9") - version( - "0.45", - sha256="1333cff1a69532e51d4484fbac3fad6b172d415d2055a3141117c7cf8bdee6c5", - deprecated=True, - ) - version( - "0.41.1", - sha256="582900e0434f49b69885a89bc65dc787362756e1014d52a4afac0bb61bcaa3ce", - deprecated=True, - ) - depends_on("py-radical-gtod", type=("build", "run"), when="@:1.13") depends_on("python@3.6:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-saga-python/package.py b/var/spack/repos/builtin/packages/py-saga-python/package.py deleted file mode 100644 index 102575dec7..0000000000 --- a/var/spack/repos/builtin/packages/py-saga-python/package.py +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PySagaPython(PythonPackage): - """A light-weight access layer for distributed computing infrastructure. - DEPRECATED (Please use `py-radical-saga`)""" - - homepage = "https://radical-cybertools.github.io" - pypi = "saga-python/saga-python-0.41.3.tar.gz" - - maintainers("andre-merzky") - - version( - "0.41.3", - sha256="b30961e634f32f6008e292aa1fe40560f257d5294b0cda95baac1cf5391feb5d", - deprecated=True, - ) - - depends_on("py-radical-utils@:0.45", type=("build", "run")) - - depends_on("py-apache-libcloud", type=("build", "run")) - depends_on("py-setuptools", type="build") diff --git a/var/spack/repos/builtin/packages/py-setuptools-cpp/package.py b/var/spack/repos/builtin/packages/py-setuptools-cpp/package.py index acb0c27233..cef294b2b8 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-cpp/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-cpp/package.py @@ -26,7 +26,6 @@ class PySetuptoolsCpp(PythonPackage): depends_on("py-chardet", type=("build", "run")) depends_on("py-certifi", type=("build", "run")) depends_on("py-click", type=("build", "run")) - depends_on("py-codecov", type=("build", "run")) depends_on("py-coverage", type=("build", "run")) depends_on("py-entrypoints", type=("build", "run")) depends_on("py-flake8", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-setuptools-rust/package.py b/var/spack/repos/builtin/packages/py-setuptools-rust/package.py index 12cec27922..a21228b12e 100644 --- a/var/spack/repos/builtin/packages/py-setuptools-rust/package.py +++ b/var/spack/repos/builtin/packages/py-setuptools-rust/package.py @@ -17,21 +17,11 @@ class PySetuptoolsRust(PythonPackage): version("1.2.0", sha256="0a4ada479e8c7e3d8bd7cb56e1a29acc2b2bb98c2325051b0cdcb57d7f056de8") version("0.12.1", sha256="647009e924f0ae439c7f3e0141a184a69ad247ecb9044c511dabde232d3d570e") - # Version 0.10.6 is not available on pypi and can only be found on github - version( - "0.10.6", - sha256="1446d3985e4aaf4cc679fda8a48a73ac1390b627c8ae1bebe7d9e08bb3b33769", - url="https://github.com/PyO3/setuptools-rust/archive/v0.10.6.tar.gz", - deprecated=True, - ) - - depends_on("python@3.7:", when="@1.2.0:", type=("build", "run")) - depends_on("python@3.6:", when="@0.12:", type=("build", "run")) depends_on("py-setuptools@62.4:", when="@1.4.0:", type=("build", "run")) - depends_on("py-setuptools@46.1:", when="@0.11.6:", type=("build", "run")) + depends_on("py-setuptools@46.1:", type=("build", "run")) depends_on("py-setuptools", type=("build", "run")) depends_on("py-setuptools-scm+toml@6.3.2:", when="@1.2.0:1.4.1", type="build") - depends_on("py-setuptools-scm+toml@3.4.3:", when="@0.11:1.1", type="build") + depends_on("py-setuptools-scm+toml@3.4.3:", when="@:1.1", type="build") depends_on("py-semantic-version@2.8.2:2", when="@1.2.0:", type=("build", "run")) depends_on("py-semantic-version@2.6.0:", type=("build", "run")) depends_on("py-typing-extensions@3.7.4.3:", when="@1.2.0:", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-sfepy/package.py b/var/spack/repos/builtin/packages/py-sfepy/package.py index 9d744df44c..699ce14509 100644 --- a/var/spack/repos/builtin/packages/py-sfepy/package.py +++ b/var/spack/repos/builtin/packages/py-sfepy/package.py @@ -18,11 +18,6 @@ class PySfepy(PythonPackage): git = "https://github.com/sfepy/sfepy.git" version("2021.3", sha256="b2a760b0f3277ac223ff25821a4156b48d06b3769e6a9a3bd0bffef5a43cbe17") - version( - "2017.3", - sha256="d13642b7abed63b83b7eaef4dfce6e84a5afc5798bc7ffa1c413e3e44b5e5996", - deprecated=True, - ) variant("petsc", default=False, description="Enable PETSc support") variant("slepc", default=False, description="Enable SLEPc support") @@ -37,12 +32,12 @@ class PySfepy(PythonPackage): depends_on("py-sympy", type="run") depends_on("hdf5+hl", type="run") depends_on("py-tables", type="run") - depends_on("py-meshio", type="run", when="@2021.3") - depends_on("py-psutil", type="run", when="@2021.3") - depends_on("py-pyvista", type="run", when="@2021.3") - depends_on("py-opt-einsum", type="run", when="@2021.3") - depends_on("py-dask", type="run", when="@2021.3") + depends_on("py-meshio", type="run") + depends_on("py-psutil", type="run") + depends_on("py-pyvista", type="run") + depends_on("py-opt-einsum", type="run") + depends_on("py-dask", type="run") depends_on("py-petsc4py", type="run", when="+petsc") - depends_on("py-slepc4py", type="run", when="+slepc @2021.3") - depends_on("py-pyamg", type="run", when="+pyamg @2021.3") - depends_on("mumps", type="run", when="+mumps @2021.3") + depends_on("py-slepc4py", type="run", when="+slepc") + depends_on("py-pyamg", type="run", when="+pyamg") + depends_on("mumps", type="run", when="+mumps") diff --git a/var/spack/repos/builtin/packages/py-sphobjinv/package.py b/var/spack/repos/builtin/packages/py-sphobjinv/package.py index f904de4d2c..afbdbcd63f 100644 --- a/var/spack/repos/builtin/packages/py-sphobjinv/package.py +++ b/var/spack/repos/builtin/packages/py-sphobjinv/package.py @@ -13,15 +13,8 @@ class PySphobjinv(PythonPackage): pypi = "sphobjinv/sphobjinv-2.3.1.tar.gz" version("2.3.1", sha256="1442a47fc93587a0177be95346904e388ef85a8366f90a1835a7c3eeeb122eb7") - version( - "2.1", - sha256="e41950a578dfd5acae24f12c7fe12b8d5e44f9162487aaa27189ca2e5c45d30c", - url="https://github.com/bskinn/sphobjinv/archive/refs/tags/v2.1.tar.gz", - deprecated=True, - ) depends_on("py-setuptools", type=("build", "run")) depends_on("py-attrs@19.2:", type=("build", "run")) depends_on("py-certifi", type=("build", "run")) depends_on("py-jsonschema@3.0:", type=("build", "run")) - depends_on("py-fuzzywuzzy@0.8:", when="@2.1", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-spyder/package.py b/var/spack/repos/builtin/packages/py-spyder/package.py deleted file mode 100644 index 524e15e59d..0000000000 --- a/var/spack/repos/builtin/packages/py-spyder/package.py +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PySpyder(PythonPackage): - """Scientific PYthon Development EnviRonment""" - - homepage = "https://github.com/spyder-ide/spyder" - pypi = "spyder/spyder-3.1.3.tar.gz" - - version("3.1.3", sha256="4978872cc5a006803bc8742d0a8fb43c49aef9524f0a9fcb8bd6dfcfdc2d2d6a") - - depends_on("python@2.7.0:2.8.0,3.3.0:", type=("build", "run")) - # pip silently replaces distutils with setuptools - depends_on("py-setuptools", type="build") - depends_on("py-rope@0.9.4:", type=("build", "run"), when="^python@:3") - # depends_on('py-rope_py3k', type=('build', 'run'), when='^python@3:') - depends_on("py-jedi@0.9.0", type=("build", "run")) - # otherwise collision with py-flake8 - depends_on("py-pyflakes@1.2.3", type=("build", "run")) - depends_on("py-pygments@2.0:", type=("build", "run")) - depends_on("py-qtconsole@4.2.0:", type=("build", "run")) - depends_on("py-nbconvert", type=("build", "run")) - depends_on("py-sphinx", type=("build", "run")) - # The pycodestyle dependency is split in two, because internally it - # changes its name from pep8 to pycodestyle, and spyder does not cope - # with this change until @3.2.0 - # https://github.com/PyCQA/pycodestyle/issues/466 - # https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md#version-32-2017-07-24 - depends_on("py-pycodestyle@:1.7.1", when="@:3.1", type=("build", "run")) - depends_on("py-pycodestyle@2.1.0:", when="@3.2.0:", type=("build", "run")) - depends_on("py-pylint", type=("build", "run")) - depends_on("py-psutil", type=("build", "run")) - depends_on("py-qtawesome@0.4.1:", type=("build", "run")) - depends_on("py-qtpy@1.1.0:", type=("build", "run")) - # technically this is a transitive dependency in order for py-pyqt4 - # to pick up webkit, but this is the easier solution (see #9207) - depends_on("qt+webkit", type=("build", "run")) - depends_on("py-pickleshare", type=("build", "run")) - depends_on("py-pyzmq", type=("build", "run")) - depends_on("py-chardet@2.0.0:", type=("build", "run")) - depends_on("py-numpydoc", type=("build", "run")) diff --git a/var/spack/repos/builtin/packages/py-thirdorder/package.py b/var/spack/repos/builtin/packages/py-thirdorder/package.py deleted file mode 100644 index 9c2e07ab67..0000000000 --- a/var/spack/repos/builtin/packages/py-thirdorder/package.py +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyThirdorder(PythonPackage): - """It helps ShengBTE users create FORCE_CONSTANTS_3RD files efficiently""" - - homepage = "https://www.shengbte.org" - url = "http://www.shengbte.org/downloads/thirdorder-v1.1.1-8526f47.tar.bz2" - - # Deprecated because download doesn't work - version( - "1.1.1-8526f47", - sha256="5e1cc8d6ffa7efdb7325c397ca236863ea8a9c5bed1c558acca68b140f89167e", - deprecated=True, - ) - - depends_on("py-numpy", type=("build", "run")) - depends_on("py-scipy", type=("build", "run")) - depends_on("spglib", type=("build", "run")) - - def patch(self): - setupfile = FileFilter("setup.py") - setupfile.filter( - "LIBRARY_DIRS = .*", 'LIBRARY_DIRS = ["%s"]' % self.spec["spglib"].prefix.lib - ) - setupfile.filter( - "INCLUDE_DIRS = .*", 'INCLUDE_DIRS = ["%s"]' % self.spec["spglib"].prefix.include - ) - - sourcefile = FileFilter("thirdorder_core.c") - sourcefile.filter('#include "spglib.*"', '#include "spglib.h"') - - @run_after("install") - def post_install(self): - mkdirp(self.prefix.bin) - install("thirdorder_espresso.py", self.prefix.bin) - install("thirdorder_vasp.py", self.prefix.bin) - install("thirdorder_castep.py", self.prefix.bin) - install("thirdorder_common.py", self.prefix.bin) diff --git a/var/spack/repos/builtin/packages/py-tomopy/package.py b/var/spack/repos/builtin/packages/py-tomopy/package.py index 9a70571d3a..5f9af067ea 100644 --- a/var/spack/repos/builtin/packages/py-tomopy/package.py +++ b/var/spack/repos/builtin/packages/py-tomopy/package.py @@ -17,12 +17,6 @@ class PyTomopy(PythonPackage): version("master", branch="master") version("1.11.0", sha256="4e5691c2b083753692ba4376ce301578037071c83fc61a6ae9e5bc9e6fcd3d1f") - # Never was an official 1.10.4 release, checksum doesn't match for some reason - version( - "1.10.4", - sha256="2f15edda11b4337a1a5560684fcf8f28a35c5035932b22b842ce728bd13fba01", - deprecated=True, - ) version("1.0.0", sha256="ee45f7a062e5a66d6f18a904d2e204e48d85a1ce1464156f9e2f6353057dfe4c") # GPU accel needs PTL which is a git submodule. Thus, we can only build it on master diff --git a/var/spack/repos/builtin/packages/py-uproot4/package.py b/var/spack/repos/builtin/packages/py-uproot4/package.py deleted file mode 100644 index 57d32e5b37..0000000000 --- a/var/spack/repos/builtin/packages/py-uproot4/package.py +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other -# Spack Project Developers. See the top-level COPYRIGHT file for details. -# -# SPDX-License-Identifier: (Apache-2.0 OR MIT) - -from spack.package import * - - -class PyUproot4(PythonPackage): - """DEPRECATED! This package was renamed to py-uproot. - - ROOT I/O in pure Python and NumPy.""" - - homepage = "https://uproot4.readthedocs.io" - git = "https://github.com/scikit-hep/uproot4" - url = "https://github.com/scikit-hep/uproot4/archive/0.0.27.tar.gz" - - maintainers("vvolkl") - - tags = ["hep"] - - version("master", branch="master", deprecated=True) - version( - "4.0.2", - sha256="8145af29788cbe6bf0ee279a7f176159f3eee801641ead4ad6e627f8c4dff0a9", - deprecated=True, - ) - version( - "0.1.2", - sha256="b32dbffadc87bc5707ee0093964d2ce4a5ccfd521b17bbf10732afc25b820d82", - deprecated=True, - ) - version( - "0.0.27", - sha256="de87555937332998b476f3e310392962bc983bddc008ed2b3c07a25c0379c4c9", - deprecated=True, - ) - - variant("xrootd", default=True, description="Build with xrootd support ") - variant( - "lz4", - default=True, - description="Build with support for reading " "lz4-compressed rootfiles ", - ) - - variant( - "zstd", - default=True, - description="Build with support for reading " "zstd-compressed rootfiles ", - ) - - depends_on("py-setuptools", type="build") - depends_on("py-numpy", type=("build", "run")) - - depends_on("xrootd", when="+xrootd") - - depends_on("lz4", when="+lz4") - depends_on("xxhash", when="+lz4") - - depends_on("zstd", when="+zstd") diff --git a/var/spack/repos/builtin/packages/py-wandb/package.py b/var/spack/repos/builtin/packages/py-wandb/package.py index 619fecce8d..8036278d72 100644 --- a/var/spack/repos/builtin/packages/py-wandb/package.py +++ b/var/spack/repos/builtin/packages/py-wandb/package.py @@ -16,44 +16,21 @@ class PyWandb(PythonPackage): maintainers("thomas-bouvier") version("0.13.9", sha256="0a17365ce1f18306ce7a7f16b943094fac7284bb85f4e52c0685705602f9e307") - version( - "0.10.1", - sha256="d02427cda58a6618ba10a027a76d9e3f68ad923d35964b1b68785c49e5160009", - deprecated=True, - ) - depends_on("python@3.6:", type=("build", "link", "run"), when="@0.13.0:") depends_on("py-setuptools", type=("build", "run")) - with when("@0.13.0:"): - depends_on("py-pathtools", type=("build", "run")) - depends_on("py-setproctitle", type=("build", "run")) - depends_on("py-appdirs@1.4.3:", type=("build", "run")) - depends_on("py-protobuf@3.19:4", type=("build", "run")) - conflicts("^py-protobuf@4.21.0") - depends_on("py-dataclasses", type=("build", "run"), when="^python@:3.6") - depends_on("py-typing-extensions", type=("build", "run"), when="^python@:3.9") - - with when("@0.10.1"): - depends_on("py-gql", type=("build", "run")) - depends_on("py-nvidia-ml-py3", type=("build", "run")) - depends_on("py-python-dateutil", type=("build", "run")) - depends_on("py-shortuuid", type=("build", "run")) - depends_on("py-six", type=("build", "run")) - depends_on("py-watchdog", type=("build", "run")) - depends_on("py-configparser", type=("build", "run")) + depends_on("py-pathtools", type=("build", "run")) + depends_on("py-setproctitle", type=("build", "run")) + depends_on("py-appdirs@1.4.3:", type=("build", "run")) + depends_on("py-protobuf@3.19:4", type=("build", "run")) + conflicts("^py-protobuf@4.21.0") + depends_on("py-typing-extensions", type=("build", "run"), when="^python@:3.9") depends_on("py-pyyaml", type=("build", "run")) - depends_on("py-click", type=("build", "run")) - depends_on("py-click@7:", type=("build", "run"), when="@0.13.0:") + depends_on("py-click@7:", type=("build", "run")) conflicts("^py-click@8.0.0") - depends_on("py-gitpython", type=("build", "run")) - depends_on("py-gitpython@1:", type=("build", "run"), when="@0.13.0:") - depends_on("py-requests", type=("build", "run")) - depends_on("py-requests@2", type=("build", "run"), when="@0.13.0:") - depends_on("py-psutil", type=("build", "run")) - depends_on("py-psutil@5:", type=("build", "run"), when="@0.13.0:") - depends_on("py-sentry-sdk", type=("build", "run")) - depends_on("py-sentry-sdk@1.0.0:", type=("build", "run"), when="@0.13.0:") - depends_on("py-dockerpy-creds", type=("build", "run")) - depends_on("py-dockerpy-creds@0.4.0:", type=("build", "run"), when="@0.13.0:") + depends_on("py-gitpython@1:", type=("build", "run")) + depends_on("py-requests@2", type=("build", "run")) + depends_on("py-psutil@5:", type=("build", "run")) + depends_on("py-sentry-sdk@1.0.0:", type=("build", "run")) + depends_on("py-dockerpy-creds@0.4.0:", type=("build", "run")) |