manual changes

lib/spack/env/cc

@@ -248,7 +248,7 @@ case "$command" in
         lang_flags=C
         debug_flags="-g"
         ;;
-    c++|CC|g++|clang++|armclang++|icpc|icpx|pgc++|nvc++|xlc++|xlc++_r|FCC|amdclang++|crayCC)
+    c++|CC|g++|clang++|armclang++|icpc|icpx|dpcpp|pgc++|nvc++|xlc++|xlc++_r|FCC|amdclang++|crayCC)
         command="$SPACK_CXX"
         language="C++"
         comp="CXX"
@@ -526,7 +526,7 @@ categorize_arguments() {
                     continue
                 fi
 
-                replaced="$after$stripped"
+                replaced="$after$stripped" 
 
                 # it matched, remove it
                 shift
@@ -913,3 +913,4 @@ fi
 # Execute the full command, preserving spaces with IFS set
 # to the alarm bell separator.
 IFS="$lsep"; exec $full_command_list
+

lib/spack/spack/build_systems/autotools.py

@@ -434,6 +434,11 @@ def _do_patch_libtool(self):
                 r"crtendS\.o",
             ]:
                 x.filter(regex=(rehead + o), repl="")
+        elif self.pkg.compiler.name == "dpcpp":
+            # Hack to filter out spurious predep_objects when building with Intel dpcpp
+            # (see https://github.com/spack/spack/issues/32863):
+            x.filter(regex=r"^(predep_objects=.*)/tmp/conftest-[0-9A-Fa-f]+\.o", repl=r"\1")
+            x.filter(regex=r"^(predep_objects=.*)/tmp/a-[0-9A-Fa-f]+\.o", repl=r"\1")
         elif self.pkg.compiler.name == "nag":
             for tag in ["fc", "f77"]:
                 marker = markers[tag]

lib/spack/spack/build_systems/cached_cmake.py

@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 import collections.abc
 import os
-import re
 from typing import Tuple
 
 import llnl.util.filesystem as fs
@@ -16,12 +15,6 @@
 from .cmake import CMakeBuilder, CMakePackage
 
 
-def spec_uses_toolchain(spec):
-    gcc_toolchain_regex = re.compile(".*gcc-toolchain.*")
-    using_toolchain = list(filter(gcc_toolchain_regex.match, spec.compiler_flags["cxxflags"]))
-    return using_toolchain
-
-
 def cmake_cache_path(name, value, comment="", force=False):
     """Generate a string for a cmake cache variable"""
     force_str = " FORCE" if force else ""
@@ -220,7 +213,7 @@ def initconfig_mpi_entries(self):
         else:
             # starting with cmake 3.10, FindMPI expects MPIEXEC_EXECUTABLE
             # vs the older versions which expect MPIEXEC
-            if spec["cmake"].satisfies("@3.10:"):
+            if self.pkg.spec["cmake"].satisfies("@3.10:"):
                 entries.append(cmake_cache_path("MPIEXEC_EXECUTABLE", mpiexec))
             else:
                 entries.append(cmake_cache_path("MPIEXEC", mpiexec))
@@ -255,17 +248,12 @@ def initconfig_hardware_entries(self):
             # Include the deprecated CUDA_TOOLKIT_ROOT_DIR for supporting BLT packages
             entries.append(cmake_cache_path("CUDA_TOOLKIT_ROOT_DIR", cudatoolkitdir))
 
-            # CUDA_FLAGS
-            cuda_flags = []
-
-            if not spec.satisfies("cuda_arch=none"):
-                cuda_archs = ";".join(spec.variants["cuda_arch"].value)
-                entries.append(cmake_cache_string("CMAKE_CUDA_ARCHITECTURES", cuda_archs))
-
-            if spec_uses_toolchain(spec):
-                cuda_flags.append("-Xcompiler {}".format(spec_uses_toolchain(spec)[0]))
-
-            entries.append(cmake_cache_string("CMAKE_CUDA_FLAGS", " ".join(cuda_flags)))
+            archs = spec.variants["cuda_arch"].value
+            if archs[0] != "none":
+                arch_str = ";".join(archs)
+                entries.append(
+                    cmake_cache_string("CMAKE_CUDA_ARCHITECTURES", "{0}".format(arch_str))
+                )
 
         if "+rocm" in spec:
             entries.append("#------------------{0}".format("-" * 30))
@@ -274,6 +262,9 @@ def initconfig_hardware_entries(self):
 
             # Explicitly setting HIP_ROOT_DIR may be a patch that is no longer necessary
             entries.append(cmake_cache_path("HIP_ROOT_DIR", "{0}".format(spec["hip"].prefix)))
+            entries.append(
+                cmake_cache_path("HIP_CXX_COMPILER", "{0}".format(self.spec["hip"].hipcc))
+            )
             llvm_bin = spec["llvm-amdgpu"].prefix.bin
             llvm_prefix = spec["llvm-amdgpu"].prefix
             # Some ROCm systems seem to point to /<path>/rocm-<ver>/ and
@@ -286,9 +277,11 @@ def initconfig_hardware_entries(self):
             archs = self.spec.variants["amdgpu_target"].value
             if archs[0] != "none":
                 arch_str = ";".join(archs)
-                entries.append(cmake_cache_string("CMAKE_HIP_ARCHITECTURES", arch_str))
-                entries.append(cmake_cache_string("AMDGPU_TARGETS", arch_str))
-                entries.append(cmake_cache_string("GPU_TARGETS", arch_str))
+                entries.append(
+                    cmake_cache_string("CMAKE_HIP_ARCHITECTURES", "{0}".format(arch_str))
+                )
+                entries.append(cmake_cache_string("AMDGPU_TARGETS", "{0}".format(arch_str)))
+                entries.append(cmake_cache_string("GPU_TARGETS", "{0}".format(arch_str)))
 
         return entries
 

lib/spack/spack/build_systems/rocm.py

@@ -145,12 +145,7 @@ class ROCmPackage(PackageBase):
     depends_on("hip +rocm", when="+rocm")
 
     # need amd gpu type for rocm builds
-    compilers_supporting_rocm = ("cce", "rocmcc", "clang", "aocc")
     conflicts("amdgpu_target=none", when="+rocm")
-    # If this variable shadows a property, it overrides it
-    for cmp_name in spack.compilers.supported_compilers():
-        if cmp_name not in compilers_supporting_rocm:
-            conflicts(f"%{cmp_name}", when="+rocm")
 
     # https://github.com/ROCm-Developer-Tools/HIP/blob/master/bin/hipcc
     # It seems that hip-clang does not (yet?) accept this flag, in which case

lib/spack/spack/compilers/dpcpp.py

@@ -0,0 +1,34 @@
+# Copyright 2013-2024 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)
+
+import os
+
+import spack.compilers.oneapi
+
+
+class Dpcpp(spack.compilers.oneapi.Oneapi):
+    """This is the same as the oneAPI compiler but uses dpcpp instead of
+    icpx (for DPC++ source files). It explicitly refers to dpcpp, so that
+    CMake test files which check the compiler name (e.g. CMAKE_CXX_COMPILER)
+    detect it as dpcpp.
+
+    Ideally we could switch out icpx for dpcpp where needed in the oneAPI
+    compiler definition, but two things are needed for that: (a) a way to
+    tell the compiler that it should be using dpcpp and (b) a way to
+    customize the link_paths
+
+    See also: https://www.intel.com/content/www/us/en/develop/documentation/oneapi-dpcpp-cpp-compiler-dev-guide-and-reference/top/compiler-setup/using-the-command-line/invoking-the-compiler.html
+    """
+
+    # Subclasses use possible names of C++ compiler
+    cxx_names = ["dpcpp"]
+
+    # Named wrapper links within build_env_path
+    link_paths = {
+        "cc": os.path.join("oneapi", "icx"),
+        "cxx": os.path.join("oneapi", "dpcpp"),
+        "f77": os.path.join("oneapi", "ifx"),
+        "fc": os.path.join("oneapi", "ifx"),
+    }

lib/spack/spack/solver/concretize.lp

@@ -18,23 +18,23 @@
 { attr("virtual_node", node(0..X-1, Package)) } :- max_dupes(Package, X), virtual(Package).
 
 % Integrity constraints on DAG nodes
-:- attr("root", PackageNode), not attr("node", PackageNode), internal_error("root without node").
-:- attr("version", PackageNode, _), not attr("node", PackageNode), not attr("virtual_node", PackageNode), internal_error("version without node").
-:- attr("node_version_satisfies", PackageNode, _), not attr("node", PackageNode), not attr("virtual_node", PackageNode), internal_error("version satisfies without node").
-:- attr("hash", PackageNode, _), not attr("node", PackageNode), internal_error("hash without node").
-:- attr("node_platform", PackageNode, _), not attr("node", PackageNode), internal_error("platform without node").
-:- attr("node_os", PackageNode, _), not attr("node", PackageNode), internal_error("os without node").
-:- attr("node_target", PackageNode, _), not attr("node", PackageNode), internal_error("target without node").
-:- attr("node_compiler_version", PackageNode, _, _), not attr("node", PackageNode), internal_error("compiler without node").
-:- attr("variant_value", PackageNode, _, _), not attr("node", PackageNode), internal_error("variant without node").
-:- attr("node_flag_compiler_default", PackageNode), not attr("node", PackageNode), internal_error("compiler flag default without node").
-:- attr("node_flag", PackageNode, _, _), not attr("node", PackageNode), internal_error("compiler flag without node").
-:- attr("no_flags", PackageNode, _), not attr("node", PackageNode), internal_error("empty compiler flag without node").
-:- attr("external_spec_selected", PackageNode, _), not attr("node", PackageNode), internal_error("external spec without node").
-:- attr("depends_on", ParentNode, _, _), not attr("node", ParentNode), internal_error("depends on without node for parent").
-:- attr("depends_on", _, ChildNode, _), not attr("node", ChildNode), internal_error("depends on without node for child").
-:- attr("node_flag_source", ParentNode, _, _), not attr("node", ParentNode), internal_error("node flag source without flag node").
-:- attr("node_flag_source", _, _, ChildNode), not attr("node", ChildNode), internal_error("node flag source without source node").
+:- attr("root", PackageNode), not attr("node", PackageNode).
+:- attr("version", PackageNode, _), not attr("node", PackageNode), not attr("virtual_node", PackageNode).
+:- attr("node_version_satisfies", PackageNode, _), not attr("node", PackageNode), not attr("virtual_node", PackageNode).
+:- attr("hash", PackageNode, _), not attr("node", PackageNode).
+:- attr("node_platform", PackageNode, _), not attr("node", PackageNode).
+:- attr("node_os", PackageNode, _), not attr("node", PackageNode).
+:- attr("node_target", PackageNode, _), not attr("node", PackageNode).
+:- attr("node_compiler_version", PackageNode, _, _), not attr("node", PackageNode).
+:- attr("variant_value", PackageNode, _, _), not attr("node", PackageNode).
+:- attr("node_flag_compiler_default", PackageNode), not attr("node", PackageNode).
+:- attr("node_flag", PackageNode, _, _), not attr("node", PackageNode).
+:- attr("no_flags", PackageNode, _), not attr("node", PackageNode).
+:- attr("external_spec_selected", PackageNode, _), not attr("node", PackageNode).
+:- attr("depends_on", ParentNode, _, _), not attr("node", ParentNode).
+:- attr("depends_on", _, ChildNode, _), not attr("node", ChildNode).
+:- attr("node_flag_source", ParentNode, _, _), not attr("node", ParentNode).
+:- attr("node_flag_source", _, _, ChildNode), not attr("node", ChildNode).
 :- attr("virtual_node", VirtualNode), not provider(_, VirtualNode), internal_error("virtual node with no provider").
 :- provider(_, VirtualNode), not attr("virtual_node", VirtualNode), internal_error("provider with no virtual node").
 :- provider(PackageNode, _), not attr("node", PackageNode), internal_error("provider with no real node").

lib/spack/spack/util/web.py

@@ -116,8 +116,8 @@ def append_curl_env_for_ssl_certs(curl):
                 "CURL config:ssl_certs "
                 "resolves to {}. This is not a file so default certs will be used.".format(certs)
             )
-    else:
-        tty.debug(dbg_msg_no_ssl_cert_config)
+    tty.debug(dbg_msg_no_ssl_cert_config)
+    return curl
 
 
 def _urlopen():
@@ -348,8 +348,7 @@ def _curl(curl=None):
         except CommandNotFoundError as exc:
             tty.error(str(exc))
             raise spack.error.FetchError("Missing required curl fetch method")
-    append_curl_env_for_ssl_certs(curl)
-    return curl
+    return append_curl_env_for_ssl_certs(curl)
 
 
 def fetch_url_text(url, curl=None, dest_dir="."):

share/spack/gitlab/cloud_pipelines/stacks/data-vis-sdk/spack.yaml

@@ -1,8 +1,6 @@
 spack:
   view: false
   packages:
-    all:
-      require: target=x86_64_v3
     cmake:
       variants: ~ownlibs
     ecp-data-vis-sdk:
@@ -22,6 +20,8 @@ spack:
       require: '@14:'
       # Minimize LLVM
       variants: ~lldb~lld~libomptarget~polly~gold libunwind=none compiler-rt=none
+    all:
+      require: target=x86_64_v3
 
   definitions:
   - paraview_specs:

share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml

@@ -81,7 +81,7 @@ spack:
   - boost +python +filesystem +iostreams +system
   - cabana
   - caliper
-  - chai
+  - chai ~benchmarks ~tests
   - charliecloud
   - conduit
   # - cp2k +mpi         # libxsmm: ftn-78 ftn: ERROR in command linel; The -f option has an invalid argument, "tree-vectorize".

share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-sles/spack.yaml

@@ -71,7 +71,7 @@ spack:
   - butterflypack
   - boost +python +filesystem +iostreams +system
   - cabana
-  - chai
+  - chai ~benchmarks ~tests
   - conduit
   # - cp2k +mpi         # cp2k: Error: Type mismatch between actual argument at (1) and actual argument at (2) (LOGICAL(4)/COMPLEX(4)).
   - datatransferkit

share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse-v2/spack.yaml

@@ -64,7 +64,7 @@ spack:
   - butterflypack
   - cabana
   - caliper
-  - chai
+  - chai ~benchmarks ~tests
   - charliecloud
   - conduit
   - cp2k +mpi
@@ -214,7 +214,7 @@ spack:
   - arborx +cuda cuda_arch=75 ^kokkos +wrapper
   - cabana +cuda cuda_arch=75 ^kokkos +wrapper +cuda_lambda +cuda cuda_arch=75
   - caliper +cuda cuda_arch=75
-  - chai +cuda cuda_arch=75 ^umpire ~shared
+  - chai ~benchmarks ~tests +cuda cuda_arch=75 ^umpire ~shared
   # - cp2k +mpi +cuda cuda_arch=75 # cp2k: cp2k only supports cuda_arch ('35', '37', '60', '70', '80')
   - flecsi +cuda cuda_arch=75
   - ginkgo +cuda cuda_arch=75
@@ -261,7 +261,7 @@ spack:
   - arborx +cuda cuda_arch=80 ^kokkos +wrapper
   - cabana +cuda cuda_arch=80 ^kokkos +wrapper +cuda_lambda +cuda cuda_arch=80
   - caliper +cuda cuda_arch=80
-  - chai +cuda cuda_arch=80 ^umpire ~shared
+  - chai ~benchmarks ~tests +cuda cuda_arch=80 ^umpire ~shared
   # - cp2k +mpi +cuda cuda_arch=80  # cp2k: Error: KeyError: 'Point environment variable LIBSMM_PATH to the absolute path of the libsmm.a file'
   - flecsi +cuda cuda_arch=80
   - ginkgo +cuda cuda_arch=80
@@ -308,7 +308,7 @@ spack:
   - arborx +cuda cuda_arch=90 ^kokkos +wrapper
   - cabana +cuda cuda_arch=90  ^kokkos +wrapper +cuda_lambda +cuda cuda_arch=90
   - caliper +cuda cuda_arch=90
-  - chai +cuda cuda_arch=90 ^umpire ~shared
+  - chai ~benchmarks ~tests +cuda cuda_arch=90 ^umpire ~shared
   # - cp2k +mpi +cuda cuda_arch=90 # cp2k: cp2k only supports cuda_arch ('35', '37', '60', '70', '80')
   - flecsi +cuda cuda_arch=90
   - ginkgo +cuda cuda_arch=90

share/spack/gitlab/cloud_pipelines/stacks/e4s-neoverse_v1/spack.yaml

@@ -64,13 +64,13 @@ spack:
   - butterflypack
   - cabana
   - caliper
-  - chai
+  - chai ~benchmarks ~tests
   - charliecloud
   - conduit
   - cp2k +mpi
   - datatransferkit
   - dyninst
-  - ecp-data-vis-sdk ~cuda ~rocm +adios2 +ascent +cinema +darshan +faodel +hdf5 +paraview +pnetcdf +sz +unifyfs +veloc ~visit +vtkm +zfp # +visit: ?
+  - ecp-data-vis-sdk ~cuda ~rocm +adios2 +ascent +cinema +darshan +faodel +hdf5 +paraview +pnetcdf +sz +unifyfs +veloc ~visit +vtkm +zfp  # +visit: ?
   - exaworks
   - flecsi
   - flit
@@ -214,7 +214,7 @@ spack:
   - arborx +cuda cuda_arch=75 ^kokkos +wrapper
   - cabana +cuda cuda_arch=75 ^kokkos +wrapper +cuda_lambda +cuda cuda_arch=75
   - caliper +cuda cuda_arch=75
-  - chai +cuda cuda_arch=75 ^umpire ~shared
+  - chai ~benchmarks ~tests +cuda cuda_arch=75 ^umpire ~shared
   # - cp2k +mpi +cuda cuda_arch=75 # cp2k: cp2k only supports cuda_arch ('35', '37', '60', '70', '80')
   - flecsi +cuda cuda_arch=75
   - ginkgo +cuda cuda_arch=75
@@ -261,7 +261,7 @@ spack:
   - arborx +cuda cuda_arch=80 ^kokkos +wrapper
   - cabana +cuda cuda_arch=80 ^kokkos +wrapper +cuda_lambda +cuda cuda_arch=80
   - caliper +cuda cuda_arch=80
-  - chai +cuda cuda_arch=80 ^umpire ~shared
+  - chai ~benchmarks ~tests +cuda cuda_arch=80 ^umpire ~shared
   # - cp2k +mpi +cuda cuda_arch=80  # cp2k: Error: KeyError: 'Point environment variable LIBSMM_PATH to the absolute path of the libsmm.a file'
   - flecsi +cuda cuda_arch=80
   - ginkgo +cuda cuda_arch=80
@@ -308,7 +308,7 @@ spack:
   - arborx +cuda cuda_arch=90 ^kokkos +wrapper
   - cabana +cuda cuda_arch=90  ^kokkos +wrapper +cuda_lambda +cuda cuda_arch=90
   - caliper +cuda cuda_arch=90
-  - chai +cuda cuda_arch=90 ^umpire ~shared
+  - chai ~benchmarks ~tests +cuda cuda_arch=90 ^umpire ~shared
   # - cp2k +mpi +cuda cuda_arch=90 # cp2k: cp2k only supports cuda_arch ('35', '37', '60', '70', '80')
   - flecsi +cuda cuda_arch=90
   - ginkgo +cuda cuda_arch=90

share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml

@@ -76,7 +76,7 @@ spack:
   - butterflypack
   - cabana
   - caliper
-  - chai
+  - chai ~benchmarks ~tests
   - charliecloud
   - conduit
   # - cp2k +mpi # dbcsr

share/spack/gitlab/cloud_pipelines/stacks/e4s-power/spack.yaml

@@ -65,7 +65,7 @@ spack:
   - butterflypack
   - cabana
   - caliper
-  - chai
+  - chai ~benchmarks ~tests
   - charliecloud
   - conduit
   - cp2k +mpi
@@ -218,7 +218,7 @@ spack:
   - amrex +cuda cuda_arch=70
   - arborx +cuda cuda_arch=70 ^kokkos +wrapper
   - caliper +cuda cuda_arch=70
-  - chai +cuda cuda_arch=70 ^umpire ~shared
+  - chai ~benchmarks ~tests +cuda cuda_arch=70 ^umpire ~shared
   # - cp2k +mpi +cuda cuda_arch=70 # dbcsr
   - ecp-data-vis-sdk ~rocm +adios2 ~ascent +hdf5 +vtkm +zfp ~paraview +cuda cuda_arch=70
   - exago +mpi +python +raja +hiop ~rocm +cuda cuda_arch=70 ~ipopt ^hiop@1.0.0 ~sparse +mpi +raja ~rocm +cuda cuda_arch=70 #^raja@0.14.0

share/spack/gitlab/cloud_pipelines/stacks/e4s-rocm-external/spack.yaml

@@ -7,12 +7,7 @@ spack:
 
   packages:
     all:
-      require:
-      - one_of:
-        - '%gcc target=x86_64_v3'
-        - '%rocmcc target=x86_64_v3'
-      - spec: '+rocm'
-        when: 'rocm=*'
+      require: '%gcc target=x86_64_v3'
       providers:
         blas: [openblas]
       variants: +mpi
@@ -145,12 +140,9 @@ spack:
       - spec: llvm-amdgpu@5.7.1
         prefix: /opt/rocm-5.7.1/llvm
         extra_attributes:
-          # These will change to new cleaner format soon
-          paths:
-            cc: /opt/rocm-5.7.1/bin/amdclang
-            cxx: /opt/rocm-5.7.1/bin/amdclang++
-            fc: /opt/rocm-5.7.1/bin/amdflang
-            f77: /opt/rocm-5.7.1/bin/amdflang
+          compilers:
+            c: /opt/rocm-5.7.1/llvm/bin/clang++
+            cxx: /opt/rocm-5.7.1/llvm/bin/clang++
     hsakmt-roct:
       buildable: false
       externals:
@@ -183,12 +175,7 @@ spack:
     rocrand:
       buildable: false
       externals:
-      - spec: rocrand@5.7.1 amdgpu_target=gfx908,gfx90a
-        prefix: /opt/rocm-5.7.1
-    hiprand:
-      buildable: false
-      externals:
-      - spec: hiprand@5.7.1 amdgpu_target=gfx908,gfx90a
+      - spec: rocrand@5.7.1
         prefix: /opt/rocm-5.7.1
     hipsolver:
       buildable: false
@@ -216,57 +203,94 @@ spack:
       - spec: rocprofiler-dev@5.7.1
         prefix: /opt/rocm-5.7.1
 
-  definitions:
-  - per_arch_specs:
-    - adios2 +kokkos
-    - amrex
-    - arborx
-    - cabana
-    - caliper
-    - chai
-    # - cp2k +mpi  # cptk: Error KeyError: 'No spec with name rocm in ... "-L{}".format(spec["rocm"].libs.directories[0])
-    - ecp-data-vis-sdk +paraview +vtkm
-    - exago +mpi +python +raja +hiop ~ipopt cxxflags="-Wno-error=non-pod-varargs" ^hiop ~sparse +mpi +raja
-    - gasnet
-    - ginkgo
-    - heffte
-    - hpx
-    - hypre
-    - kokkos
-    - legion
-    - magma ~cuda
-    - mfem
-    - petsc
-    - raja ~openmp
-    # - slate  # slate: hip/device_gescale_row_col.hip.cc:58:49: error: use of overloaded operator '*' is ambiguous (with operand types 'HIP_vector_type<double, 2>' and 'const HIP_vector_type<double, 2>')
-    - slepc
-    - strumpack ~slate
-    - sundials
-    - superlu-dist
-    - tasmanian ~openmp
-    - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack ~ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu ~stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long
-    - umpire
-    - upcxx
-    # INCLUDED IN ECP DAV ROCM
-    # - hdf5
-    # - hdf5-vol-async
-    # - hdf5-vol-cache
-    # - hdf5-vol-log
-    # - libcatalyst
-    - paraview
-    # vtk-m ~openmp  # vtk-m: https://github.com/spack/spack/issues/40268
-    # --
-    # - lbann ~cuda  # aluminum: https://github.com/spack/spack/issues/38807
-    # - papi  # papi: https://github.com/spack/spack/issues/27898
-
   specs:
   # ROCM NOARCH
-  - hpctoolkit ++rocm
-  - tau +mpi ++rocm +syscall  # tau: has issue with `spack env depfile` build
-  - matrix:
-    - [$per_arch_specs]
-    - [++rocm]
-    - [amdgpu_target==gfx908, amdgpu_target==gfx90a]
+  - hpctoolkit +rocm
+  - tau +mpi +rocm +syscall  # tau: has issue with `spack env depfile` build
+
+  # ROCM 908
+  - adios2 +kokkos +rocm amdgpu_target=gfx908
+  - amrex +rocm amdgpu_target=gfx908
+  - arborx +rocm amdgpu_target=gfx908
+  - cabana +rocm amdgpu_target=gfx908
+  - caliper +rocm amdgpu_target=gfx908
+  - chai ~benchmarks +rocm amdgpu_target=gfx908
+  # - cp2k +mpi +rocm amdgpu_target=gfx908 # cp2k: Error: KeyError: 'No spec with name rocm in... "-L{}".format(spec["rocm"].libs.directories[0]),
+  - ecp-data-vis-sdk +paraview +vtkm +rocm amdgpu_target=gfx908
+  - exago +mpi +python +raja +hiop +rocm amdgpu_target=gfx908 ~ipopt cxxflags="-Wno-error=non-pod-varargs" ^hiop@1.0.0 ~sparse +mpi +raja +rocm amdgpu_target=gfx908
+  - gasnet +rocm amdgpu_target=gfx908
+  - ginkgo +rocm amdgpu_target=gfx908
+  - heffte +rocm amdgpu_target=gfx908
+  - hpx +rocm amdgpu_target=gfx908
+  - hypre +rocm amdgpu_target=gfx908
+  - kokkos +rocm amdgpu_target=gfx908
+  - legion +rocm amdgpu_target=gfx908
+  - magma ~cuda +rocm amdgpu_target=gfx908
+  - mfem +rocm amdgpu_target=gfx908
+  - petsc +rocm amdgpu_target=gfx908
+  - raja ~openmp +rocm amdgpu_target=gfx908
+  # - slate +rocm amdgpu_target=gfx908          # slate: hip/device_gescale_row_col.hip.cc:58:49: error: use of overloaded operator '*' is ambiguous (with operand types 'HIP_vector_type<double, 2>' and 'const HIP_vector_type<double, 2>')
+  - slepc +rocm amdgpu_target=gfx908 ^petsc +rocm amdgpu_target=gfx908
+  - strumpack ~slate +rocm amdgpu_target=gfx908
+  - sundials +rocm amdgpu_target=gfx908
+  - superlu-dist +rocm amdgpu_target=gfx908
+  - tasmanian ~openmp +rocm amdgpu_target=gfx908
+  - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack ~ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu ~stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long +rocm amdgpu_target=gfx908
+  - umpire +rocm amdgpu_target=gfx908
+  - upcxx +rocm amdgpu_target=gfx908
+  # INCLUDED IN ECP DAV ROCM
+  # - hdf5
+  # - hdf5-vol-async
+  # - hdf5-vol-cache
+  # - hdf5-vol-log
+  # - libcatalyst
+  - paraview +rocm amdgpu_target=gfx908
+  # - vtk-m ~openmp +rocm amdgpu_target=gfx908  # vtk-m: https://github.com/spack/spack/issues/40268
+  # --
+  # - lbann ~cuda +rocm amdgpu_target=gfx908    # aluminum: https://github.com/spack/spack/issues/38807
+  # - papi +rocm amdgpu_target=gfx908           # papi: https://github.com/spack/spack/issues/27898
+
+  # ROCM 90a
+  - adios2 +kokkos +rocm amdgpu_target=gfx90a
+  - amrex +rocm amdgpu_target=gfx90a
+  - arborx +rocm amdgpu_target=gfx90a
+  - cabana +rocm amdgpu_target=gfx90a
+  - caliper +rocm amdgpu_target=gfx90a
+  - chai ~benchmarks +rocm amdgpu_target=gfx90a
+  # - cp2k +mpi +rocm amdgpu_target=gfx90a # cp2k: Error: KeyError: 'No spec with name rocm in... "-L{}".format(spec["rocm"].libs.directories[0]),
+  - ecp-data-vis-sdk +paraview +vtkm +rocm amdgpu_target=gfx90a
+  - exago +mpi +python +raja +hiop +rocm amdgpu_target=gfx90a ~ipopt cxxflags="-Wno-error=non-pod-varargs" ^hiop@1.0.0 ~sparse +mpi +raja +rocm amdgpu_target=gfx90a  
+  - gasnet +rocm amdgpu_target=gfx90a
+  - ginkgo +rocm amdgpu_target=gfx90a
+  - heffte +rocm amdgpu_target=gfx90a
+  - hpx +rocm amdgpu_target=gfx90a
+  - hypre +rocm amdgpu_target=gfx90a
+  - kokkos +rocm amdgpu_target=gfx90a
+  - legion +rocm amdgpu_target=gfx90a
+  - magma ~cuda +rocm amdgpu_target=gfx90a
+  - mfem +rocm amdgpu_target=gfx90a
+  - petsc +rocm amdgpu_target=gfx90a
+  - raja ~openmp +rocm amdgpu_target=gfx90a
+  # - slate +rocm amdgpu_target=gfx90a          # slate: hip/device_gescale_row_col.hip.cc:58:49: error: use of overloaded operator '*' is ambiguous (with operand types 'HIP_vector_type<double, 2>' and 'const HIP_vector_type<double, 2>')
+  - slepc +rocm amdgpu_target=gfx90a ^petsc +rocm amdgpu_target=gfx90a
+  - strumpack ~slate +rocm amdgpu_target=gfx90a
+  - sundials +rocm amdgpu_target=gfx90a
+  - superlu-dist +rocm amdgpu_target=gfx90a
+  - tasmanian ~openmp +rocm amdgpu_target=gfx90a
+  - trilinos +amesos +amesos2 +anasazi +aztec +belos +boost +epetra +epetraext +ifpack ~ifpack2 +intrepid +intrepid2 +isorropia +kokkos +ml +minitensor +muelu +nox +piro +phalanx +rol +rythmos +sacado +stk +shards +shylu ~stokhos +stratimikos +teko +tempus +tpetra +trilinoscouplings +zoltan +zoltan2 +superlu-dist gotype=long_long +rocm amdgpu_target=gfx90a
+  - umpire +rocm amdgpu_target=gfx90a
+  - upcxx +rocm amdgpu_target=gfx90a
+  # INCLUDED IN ECP DAV ROCM
+  # - hdf5
+  # - hdf5-vol-async
+  # - hdf5-vol-cache
+  # - hdf5-vol-log
+  # - libcatalyst
+  - paraview +rocm amdgpu_target=gfx90a
+  # - vtk-m ~openmp +rocm amdgpu_target=gfx90a  # vtk-m: https://github.com/spack/spack/issues/40268
+  # --
+  # - lbann ~cuda +rocm amdgpu_target=gfx90a    # aluminum: https://github.com/spack/spack/issues/38807
+  # - papi +rocm amdgpu_target=gfx90a           # papi: https://github.com/spack/spack/issues/27898
 
   ci:
     pipeline-gen:

share/spack/gitlab/cloud_pipelines/stacks/e4s/spack.yaml

@@ -69,7 +69,7 @@ spack:
   - butterflypack
   - cabana
   - caliper
-  - chai
+  - chai ~benchmarks ~tests
   - charliecloud
   - conduit
   - cp2k +mpi
@@ -78,7 +78,7 @@ spack:
   - drishti
   - dxt-explorer
   - dyninst
-  - ecp-data-vis-sdk ~cuda ~rocm +adios2 +ascent +cinema +darshan +faodel +hdf5 +paraview +pnetcdf +sz +unifyfs +veloc +visit +vtkm +zfp # adios2~cuda, ascent~cuda, darshan-runtime, darshan-util, faodel, hdf5, libcatalyst, parallel-netcdf, paraview~cuda, py-cinemasci, sz, unifyfs, veloc, visit, vtk-m, zfp
+  - ecp-data-vis-sdk ~cuda ~rocm +adios2 +ascent +cinema +darshan +faodel +hdf5 +paraview +pnetcdf +sz +unifyfs +veloc +visit +vtkm +zfp                                                                                       # adios2~cuda, ascent~cuda, darshan-runtime, darshan-util, faodel, hdf5, libcatalyst, parallel-netcdf, paraview~cuda, py-cinemasci, sz, unifyfs, veloc, visit, vtk-m, zfp
   - exaworks
   - flecsi
   - flit
@@ -222,7 +222,7 @@ spack:
   # - arborx +cuda cuda_arch=80 ^kokkos +wrapper
   # - cabana +cuda cuda_arch=80 ^kokkos +wrapper +cuda_lambda +cuda cuda_arch=80
   # - caliper +cuda cuda_arch=80
-  # - chai +cuda cuda_arch=80 ^umpire ~shared
+  # - chai ~benchmarks ~tests +cuda cuda_arch=80 ^umpire ~shared
   # - cusz +cuda cuda_arch=80
   # - dealii +cuda cuda_arch=80
   # - ecp-data-vis-sdk ~rocm +adios2 ~ascent +hdf5 +vtkm +zfp +paraview +cuda cuda_arch=80 # +ascent fails because fides fetch error
@@ -269,7 +269,7 @@ spack:
   # - arborx +cuda cuda_arch=90 ^kokkos +wrapper
   # - cabana +cuda cuda_arch=90 ^kokkos +wrapper +cuda_lambda +cuda cuda_arch=90
   # - caliper +cuda cuda_arch=90
-  # - chai +cuda cuda_arch=90 ^umpire ~shared
+  # - chai ~benchmarks ~tests +cuda cuda_arch=90 ^umpire ~shared
   # - cusz +cuda cuda_arch=90
   # - flecsi +cuda cuda_arch=90
   # - ginkgo +cuda cuda_arch=90
@@ -320,7 +320,7 @@ spack:
   # - arborx +rocm amdgpu_target=gfx908
   # - cabana +rocm amdgpu_target=gfx908
   # - caliper +rocm amdgpu_target=gfx908
-  # - chai +rocm amdgpu_target=gfx908
+  # - chai ~benchmarks +rocm amdgpu_target=gfx908
   # - ecp-data-vis-sdk +paraview +vtkm +rocm amdgpu_target=gfx908
   # - gasnet +rocm amdgpu_target=gfx908
   # - ginkgo +rocm amdgpu_target=gfx908
@@ -361,7 +361,7 @@ spack:
   # - arborx +rocm amdgpu_target=gfx90a
   # - cabana +rocm amdgpu_target=gfx90a
   # - caliper +rocm amdgpu_target=gfx90a
-  # - chai +rocm amdgpu_target=gfx90a
+  # - chai ~benchmarks +rocm amdgpu_target=gfx90a
   # - ecp-data-vis-sdk +paraview +vtkm +rocm amdgpu_target=gfx90a
   # - gasnet +rocm amdgpu_target=gfx90a
   # - ginkgo +rocm amdgpu_target=gfx90a

share/spack/gitlab/cloud_pipelines/stacks/radiuss/spack.yaml

@@ -18,7 +18,7 @@ spack:
       - blt
       - caliper
       #- care  ## ~benchmarks ~examples ~tests
-      #- chai  ## ~examples
+      #- chai  ## ~benchmarks ~examples ~tests
       - conduit  # ^hdf5+shared
       - flux-core
       #- flux-sched

var/spack/repos/builtin/packages/amrex/package.py

@@ -224,7 +224,7 @@ class Amrex(CMakePackage, CudaPackage, ROCmPackage):
         "+rocm", when="@:20.11", msg="AMReX HIP support needs AMReX newer than version 20.11"
     )
     conflicts(
-        "%rocmcc@4.2.0:4.2",
+        "%rocm@4.2.0:4.2",
         when="+rocm",
         msg="AMReX does not support rocm-4.2 due to a compiler bug",
     )
@@ -300,10 +300,11 @@ def cmake_args(self):
         if "+sycl" in self.spec:
             args.append("-DAMReX_GPU_BACKEND=SYCL")
             # SYCL GPU backend only supported with Intel's oneAPI or DPC++ compilers
-            sycl_compatible_compilers = ["icpx"]
+            sycl_compatible_compilers = ["dpcpp", "icpx"]
             if not (os.path.basename(self.compiler.cxx) in sycl_compatible_compilers):
                 raise InstallError(
-                    "AMReX's SYCL GPU Backend requires the oneAPI CXX (icpx) compiler."
+                    "AMReX's SYCL GPU Backend requires DPC++ (dpcpp)"
+                    + " or the oneAPI CXX (icpx) compiler."
                 )
 
         return args

var/spack/repos/builtin/packages/ascent/package.py

@@ -185,10 +185,7 @@ class Ascent(CMakePackage, CudaPackage):
     # RAJA and Umpire
     #######################
     depends_on("raja", when="+raja")
-    depends_on("raja+openmp", when="+raja +openmp")
-    depends_on("raja~openmp", when="+raja ~openmp")
     depends_on("umpire", when="+umpire")
-    depends_on("umpire@:2023.06.0", when="@:0.9.2 +umpire")
 
     #######################
     # BabelFlow

var/spack/repos/builtin/packages/axom/package.py

@@ -104,7 +104,7 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage):
     depends_on("cmake@3.21:", type="build", when="+rocm")
 
     depends_on("blt", type="build")
-    depends_on("blt@0.5.1:0.5.3", type="build", when="@0.6.1:")
+    depends_on("blt@0.5.1:", type="build", when="@0.6.1:")
 
     depends_on("mpi", when="+mpi")
 
@@ -122,13 +122,13 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage):
     depends_on("scr~fortran", when="+scr~fortran")
 
     with when("+umpire"):
-        depends_on("umpire@2022.03.0:2023.06", when="@0.7.0:")
+        depends_on("umpire@2022.03.0:", when="@0.7.0:")
         depends_on("umpire@6.0.0", when="@0.6.0")
         depends_on("umpire@5:5.0.1", when="@:0.5.0")
         depends_on("umpire +openmp", when="+openmp")
 
     with when("+raja"):
-        depends_on("raja@2022.03.0:2023.06", when="@0.7.0:")
+        depends_on("raja@2022.03.0:", when="@0.7.0:")
         depends_on("raja@0.14.0", when="@0.6.0")
         depends_on("raja@:0.13.0", when="@:0.5.0")
         depends_on("raja~openmp", when="~openmp")

var/spack/repos/builtin/packages/blt/package.py

@@ -3,57 +3,9 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-import os
-import re
-
 from spack.package import *
 
 
-def spec_uses_toolchain(spec):
-    gcc_toolchain_regex = re.compile(".*gcc-toolchain.*")
-    using_toolchain = list(filter(gcc_toolchain_regex.match, spec.compiler_flags["cxxflags"]))
-    return using_toolchain
-
-
-def spec_uses_gccname(spec):
-    gcc_name_regex = re.compile(".*gcc-name.*")
-    using_gcc_name = list(filter(gcc_name_regex.match, spec.compiler_flags["cxxflags"]))
-    return using_gcc_name
-
-
-def llnl_link_helpers(options, spec, compiler):
-    # From local package:
-    if compiler.fc:
-        fortran_compilers = ["gfortran", "xlf"]
-        if any(f_comp in compiler.fc for f_comp in fortran_compilers) and (
-            "clang" in compiler.cxx
-        ):
-            # Pass fortran compiler lib as rpath to find missing libstdc++
-            libdir = os.path.join(os.path.dirname(os.path.dirname(compiler.fc)), "lib")
-            flags = ""
-            for _libpath in [libdir, libdir + "64"]:
-                if os.path.exists(_libpath):
-                    flags += " -Wl,-rpath,{0}".format(_libpath)
-            description = "Adds a missing libstdc++ rpath"
-            if flags:
-                options.append(cmake_cache_string("BLT_EXE_LINKER_FLAGS", flags, description))
-
-    if "cce" in compiler.cxx:
-        description = "Adds a missing rpath for libraries " "associated with the fortran compiler"
-        # Here is where to find libs that work for fortran
-        libdir = "/opt/cray/pe/cce/{0}/cce-clang/x86_64/lib".format(compiler.version)
-        linker_flags = "${{BLT_EXE_LINKER_FLAGS}} -Wl,-rpath,{0}".format(libdir)
-
-        version = "{0}".format(compiler.version)
-
-        if version == "16.0.0" or version == "16.0.1":
-            # Here is another directory added by cce@16.0.0 and cce@16.0.1
-            libdir = os.path.join(libdir, "x86_64-unknown-linux-gnu")
-            linker_flags += " -Wl,-rpath,{0}".format(libdir)
-
-        options.append(cmake_cache_string("BLT_EXE_LINKER_FLAGS", linker_flags, description))
-
-
 class Blt(Package):
     """BLT is a streamlined CMake-based foundation for Building, Linking and
     Testing large-scale high performance computing (HPC) applications."""

var/spack/repos/builtin/packages/byfl/package.py

@@ -18,5 +18,4 @@ class Byfl(CMakePackage):
 
     version("1.8.0", sha256="45a9640ba2d77153a425c72349c18b124754123b30c411707b71abd217bbfce0")
 
-    # llvm-13 builds, but doesn’t work
-    depends_on("llvm@:12.9999")
+    depends_on("llvm@:13.9999")

var/spack/repos/builtin/packages/caliper/package.py

@@ -78,7 +78,7 @@ class Caliper(CMakePackage, CudaPackage, ROCmPackage):
     is_linux = sys.platform.startswith("linux")
     variant("shared", default=True, description="Build shared libraries")
     variant("adiak", default=True, description="Enable Adiak support")
-    variant("mpi", default=True, description="Enable MPI support")
+    variant("mpi", default=True, description="Enable MPI wrappers")
     # libunwind has some issues on Mac
     variant(
         "libunwind", default=sys.platform != "darwin", description="Enable stack unwind support"
@@ -94,7 +94,6 @@ class Caliper(CMakePackage, CudaPackage, ROCmPackage):
     variant("fortran", default=False, description="Enable Fortran support")
     variant("variorum", default=False, description="Enable Variorum support")
     variant("kokkos", default=True, when="@2.3.0:", description="Enable Kokkos profiling support")
-    variant("tests", default=False, description="Enable tests")
 
     depends_on("adiak@0.1:0", when="@2.2: +adiak")
 

var/spack/repos/builtin/packages/camp/package.py

@@ -3,9 +3,29 @@
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
+import glob
+
 from spack.package import *
 
 
+def hip_repair_options(options, spec):
+    # there is only one dir like this, but the version component is unknown
+    options.append(
+        "-DHIP_CLANG_INCLUDE_PATH="
+        + glob.glob("{}/lib/clang/*/include".format(spec["llvm-amdgpu"].prefix))[0]
+    )
+
+
+def hip_repair_cache(options, spec):
+    # there is only one dir like this, but the version component is unknown
+    options.append(
+        cmake_cache_path(
+            "HIP_CLANG_INCLUDE_PATH",
+            glob.glob("{}/lib/clang/*/include".format(spec["llvm-amdgpu"].prefix))[0],
+        )
+    )
+
+
 class Camp(CMakePackage, CudaPackage, ROCmPackage):
     """
     Compiler agnostic metaprogramming library providing concepts,
@@ -20,21 +40,8 @@ class Camp(CMakePackage, CudaPackage, ROCmPackage):
 
     license("BSD-3-Clause")
 
-    version("main", branch="main", submodules=False)
-    version(
-        "2024.02.0",
-        tag="v2024.02.0",
-        commit="03c80a6c6ab4f97e76a52639563daec71435a277",
-        submodules=False,
-    )
-    version(
-        "2023.06.0",
-        tag="v2023.06.0",
-        commit="ac34c25b722a06b138bc045d38bfa5e8fa3ec9c5",
-        submodules=False,
-    )
+    version("main", branch="main", submodules="True")
     version("2022.10.1", sha256="2d12f1a46f5a6d01880fc075cfbd332e2cf296816a7c1aa12d4ee5644d386f02")
-    version("2022.10.0", sha256="3561c3ef00bbcb61fe3183c53d49b110e54910f47e7fc689ad9ccce57e55d6b8")
     version("2022.03.2", sha256="bc4aaeacfe8f2912e28f7a36fc731ab9e481bee15f2c6daf0cb208eed3f201eb")
     version("2022.03.0", sha256="e9090d5ee191ea3a8e36b47a8fe78f3ac95d51804f1d986d931e85b8f8dad721")
     version("0.3.0", sha256="129431a049ca5825443038ad5a37a86ba6d09b2618d5fe65d35f83136575afdb")
@@ -44,13 +51,12 @@ class Camp(CMakePackage, CudaPackage, ROCmPackage):
 
     # TODO: figure out gtest dependency and then set this default True.
     variant("tests", default=False, description="Build tests")
-    variant("openmp", default=False, description="Build with OpenMP support")
+    variant("openmp", default=False, description="Build OpenMP support")
 
     depends_on("cub", when="+cuda")
 
     depends_on("blt", type="build")
-    depends_on("blt@0.6.1:", type="build", when="@2024.02.0:")
-    depends_on("blt@0.5.0:0.5.3", type="build", when="@2022.03.0:2023.06.0")
+    depends_on("blt@0.5.0:0.5.3", type="build", when="@2022.03.0:")
 
     patch("libstdc++-13-missing-header.patch", when="@:2022.10")
 
@@ -63,9 +69,11 @@ def cmake_args(self):
 
         options.append("-DBLT_SOURCE_DIR={0}".format(spec["blt"].prefix))
 
-        options.append(self.define_from_variant("ENABLE_CUDA", "cuda"))
+        options.append("-DENABLE_OPENMP=" + ("On" if "+openmp" in spec else "Off"))
         if "+cuda" in spec:
-            options.append("-DCUDA_TOOLKIT_ROOT_DIR={0}".format(spec["cuda"].prefix))
+            options.extend(
+                ["-DENABLE_CUDA=ON", "-DCUDA_TOOLKIT_ROOT_DIR=%s" % (spec["cuda"].prefix)]
+            )
 
             if not spec.satisfies("cuda_arch=none"):
                 cuda_arch = spec.variants["cuda_arch"].value
@@ -73,17 +81,21 @@ def cmake_args(self):
                 options.append("-DCUDA_ARCH=sm_{0}".format(cuda_arch[0]))
                 flag = "-arch sm_{0}".format(cuda_arch[0])
                 options.append("-DCMAKE_CUDA_FLAGS:STRING={0}".format(flag))
+        else:
+            options.append("-DENABLE_CUDA=OFF")
 
-        options.append(self.define_from_variant("ENABLE_HIP", "rocm"))
         if "+rocm" in spec:
-            options.append("-DHIP_ROOT_DIR={0}".format(spec["hip"].prefix))
+            options.extend(["-DENABLE_HIP=ON", "-DHIP_ROOT_DIR={0}".format(spec["hip"].prefix)])
+
+            hip_repair_options(options, spec)
 
             archs = self.spec.variants["amdgpu_target"].value
-            options.append("-DCMAKE_HIP_ARCHITECTURES={0}".format(archs))
-            options.append("-DGPU_TARGETS={0}".format(archs))
-            options.append("-DAMDGPU_TARGETS={0}".format(archs))
+            if archs != "none":
+                arch_str = ",".join(archs)
+                options.append("-DHIP_HIPCC_FLAGS=--amdgpu-target={0}".format(arch_str))
+        else:
+            options.append("-DENABLE_HIP=OFF")
 
-        options.append(self.define_from_variant("ENABLE_OPENMP", "openmp"))
         options.append(self.define_from_variant("ENABLE_TESTS", "tests"))
 
         return options

var/spack/repos/builtin/packages/care/package.py

@@ -45,7 +45,7 @@ class Care(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("camp")
     depends_on("umpire@develop")
     depends_on("raja@develop")
-    depends_on("chai@develop+enable_pick")
+    depends_on("chai@develop+enable_pick~benchmarks")
 
     # WARNING: this package currently only supports an internal cub
     # package. This will cause a race condition if compiled with another

var/spack/repos/builtin/packages/chai/change_mpi_target_name_umpire_patch.patch

@@ -1,13 +0,0 @@
-diff --git a/cmake/thirdparty/SetupChaiThirdparty.cmake b/cmake/thirdparty/SetupChaiThirdparty.cmake
-index d0be864..a8b33f0 100644
---- a/cmake/thirdparty/SetupChaiThirdparty.cmake
-+++ b/cmake/thirdparty/SetupChaiThirdparty.cmake
-@@ -12,7 +12,7 @@ if (NOT TARGET umpire)
-     find_package(umpire REQUIRED)
- 
-     if (ENABLE_MPI)
--      set(UMPIRE_DEPENDS mpi)
-+      set(UMPIRE_DEPENDS MPI::MPI_CXX)
-     else()
-       set(UMPIRE_DEPENDS)
-     endif()

var/spack/repos/builtin/packages/chai/package.py

@@ -7,8 +7,6 @@
 
 from spack.package import *
 
-from .blt import llnl_link_helpers
-
 
 class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
     """
@@ -24,24 +22,7 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
     license("BSD-3-Clause")
 
     version("develop", branch="develop", submodules=False)
-    version(
-        "2024.02.0",
-        tag="v2024.02.0",
-        commit="31773a2f0d30f3f64c82939f60fc4da32cf33261",
-        submodules=False,
-    )
-    version(
-        "2023.06.0",
-        tag="v2023.06.0",
-        commit="6fe3470ad020303530af2f3dbbfe18826bd3319b",
-        submodules=False,
-    )
-    version(
-        "2022.10.0",
-        tag="v2022.10.0",
-        commit="9510efd33b06e4443b15447eebb7dad761822654",
-        submodules=False,
-    )
+    version("main", branch="main", submodules=False)
     version(
         "2022.03.0",
         tag="v2022.03.0",
@@ -80,10 +61,6 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
     )
     version("1.0", tag="v1.0", commit="501a098ad879dc8deb4a74fcfe8c08c283a10627", submodules=True)
 
-    # Patching Umpire for dual BLT targets import changed MPI target name in Umpire link interface
-    # We propagate the patch here.
-    patch("change_mpi_target_name_umpire_patch.patch", when="@2022.10.0:2023.06.0")
-
     variant("enable_pick", default=False, description="Enable pick method")
     variant(
         "separable_compilation",
@@ -91,43 +68,29 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
         description="Build with CUDA_SEPARABLE_COMPILATION flag on ",
     )
     variant("shared", default=True, description="Build Shared Libs")
-    variant("mpi", default=False, description="Enable MPI support")
     variant("raja", default=False, description="Build plugin for RAJA")
+    variant("benchmarks", default=False, description="Build benchmarks.")
     variant("examples", default=True, description="Build examples.")
     variant("openmp", default=False, description="Build using OpenMP")
     # TODO: figure out gtest dependency and then set this default True
     # and remove the +tests conflict below.
-    variant(
-        "tests",
-        default="none",
-        values=("none", "basic", "benchmarks"),
-        multi=False,
-        description="Tests to run",
-    )
+    variant("tests", default=False, description="Build tests")
 
     depends_on("cmake@3.8:", type="build")
     depends_on("cmake@3.9:", type="build", when="+cuda")
-    depends_on("cmake@3.14:", type="build", when="@2022.03.0:")
+    depends_on("cmake@3.14:", when="@2022.03.0:")
 
-    depends_on("blt")
-    depends_on("blt@0.6.1:", type="build", when="@2024.02.0:")
-    depends_on("blt@0.5.3", type="build", when="@2023.06.0")
-    depends_on("blt@0.5.2:0.5.3", type="build", when="@2022.10.0")
-    depends_on("blt@0.5.0:0.5.3", type="build", when="@2022.03.0")
-    depends_on("blt@0.4.1:0.5.3", type="build", when="@2.4.0")
-    depends_on("blt@0.4.0:0.5.3", type="build", when="@2.3.0")
-    depends_on("blt@0.3.6:0.5.3", type="build", when="@:2.2.2")
+    depends_on("blt@0.5.0:", type="build", when="@2022.03.0:")
+    depends_on("blt@0.4.1:", type="build", when="@2.4.0:")
+    depends_on("blt@0.4.0:", type="build", when="@2.3.0")
+    depends_on("blt@0.3.6:", type="build", when="@:2.2.2")
     conflicts("^blt@:0.3.6", when="+rocm")
 
     depends_on("umpire")
-    depends_on("umpire@2024.02.0:", when="@2024.02.0:")
-    depends_on("umpire@2023.06.0", when="@2023.06.0")
-    depends_on("umpire@2022.10.0:2023.06.0", when="@2022.10.0")
-    depends_on("umpire@2022.03.0:2023.06.0", when="@2022.03.0")
+    depends_on("umpire@2022.03.0:", when="@2022.03.0:")
     depends_on("umpire@6.0.0", when="@2.4.0")
     depends_on("umpire@4.1.2", when="@2.2.0:2.3.0")
-
-    depends_on("umpire+mpi", when="+mpi")
+    depends_on("umpire@main", when="@main")
 
     with when("+cuda"):
         depends_on("umpire+cuda")
@@ -144,13 +107,11 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
     with when("+raja"):
         depends_on("raja~openmp", when="~openmp")
         depends_on("raja+openmp", when="+openmp")
-        depends_on("raja@2024.02.0:", when="@2024.02.0:")
-        depends_on("raja@2023.06.0", when="@2023.06.0")
-        depends_on("raja@2022.10.0:2023.06.0", when="@2022.10.0")
-        depends_on("raja@2022.03.0:2023.06.0", when="@2022.03.0")
-        depends_on("raja@0.12.0", when="@2.2.0:2.2.2")
-        depends_on("raja@0.13.0", when="@2.3.0")
         depends_on("raja@0.14.0", when="@2.4.0")
+        depends_on("raja@0.13.0", when="@2.3.0")
+        depends_on("raja@0.12.0", when="@2.2.0:2.2.2")
+        depends_on("raja@2022.03.0:", when="@2022.03.0:")
+        depends_on("raja@main", when="@main")
 
         with when("+cuda"):
             depends_on("raja+cuda")
@@ -164,7 +125,7 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
                     when="amdgpu_target={0}".format(arch),
                 )
 
-    depends_on("mpi", when="+mpi")
+    conflicts("+benchmarks", when="~tests")
 
     def _get_sys_type(self, spec):
         sys_type = spec.architecture
@@ -177,31 +138,25 @@ def cache_name(self):
         hostname = socket.gethostname()
         if "SYS_TYPE" in env:
             hostname = hostname.rstrip("1234567890")
-        return "{0}-{1}-{2}@{3}-{4}.cmake".format(
+        return "{0}-{1}-{2}@{3}.cmake".format(
             hostname,
             self._get_sys_type(self.spec),
             self.spec.compiler.name,
             self.spec.compiler.version,
-            self.spec.dag_hash(8),
         )
 
     def initconfig_compiler_entries(self):
         spec = self.spec
-        compiler = self.compiler
-        # Default entries are already defined in CachedCMakePackage, inherit them:
         entries = super().initconfig_compiler_entries()
-
-        llnl_link_helpers(entries, spec, compiler)
-
+        if "+rocm" in spec:
+            entries.insert(0, cmake_cache_path("CMAKE_CXX_COMPILER", spec["hip"].hipcc))
         return entries
 
     def initconfig_hardware_entries(self):
         spec = self.spec
         entries = super().initconfig_hardware_entries()
 
-        entries.append("#------------------{0}".format("-" * 30))
-        entries.append("# Package custom hardware settings")
-        entries.append("#------------------{0}\n".format("-" * 30))
+        entries.append(cmake_cache_option("ENABLE_OPENMP", "+openmp" in spec))
 
         if "+cuda" in spec:
             entries.append(cmake_cache_option("ENABLE_CUDA", True))
@@ -209,67 +164,54 @@ def initconfig_hardware_entries(self):
                 entries.append(cmake_cache_option("CMAKE_CUDA_SEPARABLE_COMPILATION", True))
                 entries.append(cmake_cache_option("CUDA_SEPARABLE_COMPILATION", True))
 
+            if not spec.satisfies("cuda_arch=none"):
+                cuda_arch = spec.variants["cuda_arch"].value
+                entries.append(cmake_cache_string("CUDA_ARCH", "sm_{0}".format(cuda_arch[0])))
+                entries.append(
+                    cmake_cache_string("CMAKE_CUDA_ARCHITECTURES", "{0}".format(cuda_arch[0]))
+                )
+                flag = "-arch sm_{0}".format(cuda_arch[0])
+                entries.append(cmake_cache_string("CMAKE_CUDA_FLAGS", "{0}".format(flag)))
         else:
             entries.append(cmake_cache_option("ENABLE_CUDA", False))
 
         if "+rocm" in spec:
             entries.append(cmake_cache_option("ENABLE_HIP", True))
+            entries.append(cmake_cache_path("HIP_ROOT_DIR", "{0}".format(spec["hip"].prefix)))
+            archs = self.spec.variants["amdgpu_target"].value
+            if archs != "none":
+                arch_str = ",".join(archs)
+                entries.append(
+                    cmake_cache_string("HIP_HIPCC_FLAGS", "--amdgpu-target={0}".format(arch_str))
+                )
         else:
             entries.append(cmake_cache_option("ENABLE_HIP", False))
 
         return entries
 
-    def initconfig_mpi_entries(self):
-        spec = self.spec
-
-        entries = super(Chai, self).initconfig_mpi_entries()
-        entries.append(cmake_cache_option("ENABLE_MPI", "+mpi" in spec))
-
-        return entries
-
     def initconfig_package_entries(self):
         spec = self.spec
         entries = []
 
         option_prefix = "CHAI_" if spec.satisfies("@2022.03.0:") else ""
 
-        # TPL locations
-        entries.append("#------------------{0}".format("-" * 60))
-        entries.append("# TPLs")
-        entries.append("#------------------{0}\n".format("-" * 60))
-
         entries.append(cmake_cache_path("BLT_SOURCE_DIR", spec["blt"].prefix))
         if "+raja" in spec:
             entries.append(cmake_cache_option("{}ENABLE_RAJA_PLUGIN".format(option_prefix), True))
             entries.append(cmake_cache_path("RAJA_DIR", spec["raja"].prefix))
-        entries.append(cmake_cache_path("umpire_DIR", spec["umpire"].prefix))
-
-        # Build options
-        entries.append("#------------------{0}".format("-" * 60))
-        entries.append("# Build Options")
-        entries.append("#------------------{0}\n".format("-" * 60))
-
-        # Build options
-        entries.append(cmake_cache_string("CMAKE_BUILD_TYPE", spec.variants["build_type"].value))
-        entries.append(cmake_cache_option("BUILD_SHARED_LIBS", "+shared" in spec))
-
-        # Generic options that have a prefixed equivalent in CHAI CMake
-        entries.append(cmake_cache_option("ENABLE_OPENMP", "+openmp" in spec))
-        entries.append(cmake_cache_option("ENABLE_EXAMPLES", "+examples" in spec))
-        entries.append(cmake_cache_option("ENABLE_DOCS", False))
-        if "tests=benchmarks" in spec:
-            # BLT requires ENABLE_TESTS=True to enable benchmarks
-            entries.append(cmake_cache_option("ENABLE_BENCHMARKS", True))
-            entries.append(cmake_cache_option("ENABLE_TESTS", True))
-        else:
-            entries.append(cmake_cache_option("ENABLE_TESTS", "tests=none" not in spec))
-
-        # Prefixed options that used to be name without one
         entries.append(
             cmake_cache_option("{}ENABLE_PICK".format(option_prefix), "+enable_pick" in spec)
         )
+        entries.append(cmake_cache_path("umpire_DIR", spec["umpire"].prefix.share.umpire.cmake))
+        entries.append(cmake_cache_option("ENABLE_TESTS", "+tests" in spec))
+        entries.append(cmake_cache_option("ENABLE_BENCHMARKS", "+benchmarks" in spec))
+        entries.append(
+            cmake_cache_option("{}ENABLE_EXAMPLES".format(option_prefix), "+examples" in spec)
+        )
+        entries.append(cmake_cache_option("BUILD_SHARED_LIBS", "+shared" in spec))
 
         return entries
 
     def cmake_args(self):
-        return []
+        options = []
+        return options

var/spack/repos/builtin/packages/double-batched-fft-library/package.py

@@ -41,8 +41,10 @@ class DoubleBatchedFftLibrary(CMakePackage):
 
     def cmake_args(self):
         cxx_compiler = os.path.basename(self.compiler.cxx)
-        if self.spec.satisfies("+sycl") and cxx_compiler not in ["icpx"]:
-            raise InstallError("The Double-Batched FFT Library requires the oneapi C++ Compiler")
+        if self.spec.satisfies("+sycl") and cxx_compiler not in ["icpx", "dpcpp"]:
+            raise InstallError(
+                "The Double-Batched FFT Library requires the oneapi DPC++/C++ Compiler"
+            )
 
         return [
             self.define_from_variant("BUILD_SHARED_LIBS", "shared"),

var/spack/repos/builtin/packages/dpcpp/package.py

@@ -0,0 +1,166 @@
+# Copyright 2013-2024 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)
+
+
+import os
+
+from spack.package import *
+
+
+class Dpcpp(CMakePackage):
+    """Data Parallel C++ compiler: Intel's implementation of SYCL programming model"""
+
+    homepage = "https://intel.github.io/llvm-docs/"
+    git = "https://github.com/intel/llvm.git"
+
+    license("Apache-2.0")
+
+    version("develop", branch="sycl")
+    version("2021.09", commit="bd68232bb96386bf7649345c0557ba520e73c02d")
+    version("2021.12", commit="27f59d8906fcc8aece7ff6aa570ccdee52168c2d")
+
+    maintainers("ravil-mobile")
+    variant("cuda", default=False, description="switch from OpenCL to CUDA")
+    variant("rocm", default=False, description="switch from OpenCL to ROCm")
+    variant(
+        "rocm-platform",
+        default="AMD",
+        values=("AMD", "NVIDIA"),
+        multi=False,
+        description="choose ROCm backend",
+    )
+    variant("openmp", default=False, description="build with OpenMP without target offloading")
+    variant("esimd-cpu", default=False, description="build with ESIMD_CPU support")
+    variant("assertions", default=False, description="build with assertions")
+    variant("docs", default=False, description="build Doxygen documentation")
+    variant("werror", default=False, description="treat warnings as errors")
+    variant("shared", default=False, description="build shared libraries")
+    variant("remangle_libclc", default=True, description="remangle libclc gen. variants")
+    variant("lld", default=False, description="use LLD linker for build")
+
+    depends_on("cmake@3.16.2:", type="build")
+    depends_on("ninja@1.10.0:", type="build")
+
+    depends_on("cuda@10.2.0:11.4.999", when="+cuda")
+
+    # NOTE: AMD HIP needs to be tested; it will be done in the next update
+    # depends_on('cuda@10.2.0:10.2.999', when='rocm-platform=NVIDIA', type='build')
+    # depends_on('hip@4.0.0:', when='+rocm', type='build')
+
+    root_cmakelists_dir = "llvm"
+
+    def cmake_args(self):
+        llvm_external_projects = "sycl;llvm-spirv;opencl;libdevice;xpti;xptifw"
+
+        if "+openmp" in self.spec:
+            llvm_external_projects += ";openmp"
+
+        sycl_dir = os.path.join(self.stage.source_path, "sycl")
+        spirv_dir = os.path.join(self.stage.source_path, "llvm-spirv")
+        xpti_dir = os.path.join(self.stage.source_path, "xpti")
+        xptifw_dir = os.path.join(self.stage.source_path, "xptifw")
+        libdevice_dir = os.path.join(self.stage.source_path, "libdevice")
+        llvm_enable_projects = "clang;" + llvm_external_projects
+        libclc_targets_to_build = ""
+        sycl_build_pi_rocm_platform = self.spec.variants["rocm-platform"].value
+
+        if self.spec.satisfies("target=x86_64:"):
+            llvm_targets_to_build = "X86"
+        elif self.spec.satisfies("target=aarch64:"):
+            llvm_targets_to_build = "ARM;AArch64"
+        else:
+            raise InstallError(
+                "target is not supported. " "This package only works on x86_64 or aarch64"
+            )
+
+        is_cuda = "+cuda" in self.spec
+        is_rocm = "+rocm" in self.spec
+
+        if is_cuda or is_rocm:
+            llvm_enable_projects += ";libclc"
+
+        if is_cuda:
+            llvm_targets_to_build += ";NVPTX"
+            libclc_targets_to_build = "nvptx64--;nvptx64--nvidiacl"
+
+        if is_rocm:
+            if sycl_build_pi_rocm_platform == "AMD":
+                llvm_targets_to_build += ";AMDGPU"
+                libclc_targets_to_build += ";amdgcn--;amdgcn--amdhsa"
+            elif sycl_build_pi_rocm_platform and not is_cuda:
+                llvm_targets_to_build += ";NVPTX"
+                libclc_targets_to_build += ";nvptx64--;nvptx64--nvidiacl"
+
+        args = [
+            self.define_from_variant("LLVM_ENABLE_ASSERTIONS", "assertions"),
+            self.define("LLVM_TARGETS_TO_BUILD", llvm_targets_to_build),
+            self.define("LLVM_EXTERNAL_PROJECTS", llvm_external_projects),
+            self.define("LLVM_EXTERNAL_SYCL_SOURCE_DIR", sycl_dir),
+            self.define("LLVM_EXTERNAL_LLVM_SPIRV_SOURCE_DIR", spirv_dir),
+            self.define("LLVM_EXTERNAL_XPTI_SOURCE_DIR", xpti_dir),
+            self.define("XPTI_SOURCE_DIR", xpti_dir),
+            self.define("LLVM_EXTERNAL_XPTIFW_SOURCE_DIR", xptifw_dir),
+            self.define("LLVM_EXTERNAL_LIBDEVICE_SOURCE_DIR", libdevice_dir),
+            self.define("LLVM_ENABLE_PROJECTS", llvm_enable_projects),
+            self.define("LIBCLC_TARGETS_TO_BUILD", libclc_targets_to_build),
+            self.define_from_variant("SYCL_BUILD_PI_CUDA", "cuda"),
+            self.define_from_variant("SYCL_BUILD_PI_ROCM", "rocm"),
+            self.define("SYCL_BUILD_PI_ROCM_PLATFORM", sycl_build_pi_rocm_platform),
+            self.define("LLVM_BUILD_TOOLS", True),
+            self.define_from_variant("SYCL_ENABLE_WERROR", "werror"),
+            self.define("SYCL_INCLUDE_TESTS", True),
+            self.define_from_variant("LIBCLC_GENERATE_REMANGLED_VARIANTS", "remangle_libclc"),
+            self.define_from_variant("LLVM_ENABLE_DOXYGEN", "docs"),
+            self.define_from_variant("LLVM_ENABLE_SPHINX", "docs"),
+            self.define_from_variant("BUILD_SHARED_LIBS", "shared"),
+            self.define("SYCL_ENABLE_XPTI_TRACING", "ON"),
+            self.define_from_variant("LLVM_ENABLE_LLD", "lld"),
+            self.define_from_variant("SYCL_BUILD_PI_ESIMD_CPU", "esimd-cpu"),
+        ]
+
+        if is_cuda or (is_rocm and sycl_build_pi_rocm_platform == "NVIDIA"):
+            args.append(self.define("CUDA_TOOLKIT_ROOT_DIR", self.spec["cuda"].prefix))
+
+        if "+openmp" in self.spec:
+            omp_dir = os.path.join(self.stage.source_path, "openmp")
+            args.extend(
+                [
+                    self.define("LLVM_EXTERNAL_OPENMP_SOURCE_DIR", omp_dir),
+                    self.define("OPENMP_ENABLE_LIBOMPTARGET", False),
+                ]
+            )
+
+        if self.compiler.name == "gcc":
+            gcc_prefix = ancestor(self.compiler.cc, 2)
+            args.append(self.define("GCC_INSTALL_PREFIX", gcc_prefix))
+
+        return args
+
+    def setup_build_environment(self, env):
+        if "+cuda" in self.spec:
+            env.set("CUDA_LIB_PATH", "{0}/lib64/stubs".format(self.spec["cuda"].prefix))
+
+    @run_after("install")
+    def post_install(self):
+        clang_cpp_path = os.path.join(self.spec.prefix.bin, "clang++")
+        dpcpp_path = os.path.join(self.spec.prefix.bin, "dpcpp")
+
+        real_clang_cpp_path = os.path.realpath(clang_cpp_path)
+        os.symlink(real_clang_cpp_path, dpcpp_path)
+
+    def setup_run_environment(self, env):
+        bin_path = self.spec.prefix.bin
+        for env_var_name, compiler in zip(["CC", "CXX"], ["clang", "clang++"]):
+            env.set(env_var_name, os.path.join(bin_path, compiler))
+
+        include_env_vars = ["C_INCLUDE_PATH", "CPLUS_INCLUDE_PATH", "INCLUDE"]
+        for var in include_env_vars:
+            env.prepend_path(var, self.prefix.include)
+            env.prepend_path(var, self.prefix.include.sycl)
+
+        sycl_build_pi_rocm_platform = self.spec.variants["rocm-platform"].value
+        if "+cuda" in self.spec or sycl_build_pi_rocm_platform == "NVIDIA":
+            env.prepend_path("PATH", self.spec["cuda"].prefix.bin)
+            env.set("CUDA_TOOLKIT_ROOT_DIR", self.spec["cuda"].prefix)

var/spack/repos/builtin/packages/dray/package.py

@@ -81,10 +81,9 @@ class Dray(Package, CudaPackage):
     depends_on("apcomp~shared", when="~shared")
     depends_on("apcomp+shared", when="+shared")
 
-    depends_on("raja@0.14.0:0.14", when="@0.1.8:")
+    depends_on("raja@0.12.0:")
     depends_on("raja@:0.14", when="@0.1.7:")
     depends_on("raja@:0.13", when="@:0.1.6")
-    depends_on("raja@0.12.0:")
     depends_on("raja~cuda", when="~cuda")
     depends_on("raja+cuda", when="+cuda")
     propagate_cuda_arch("raja")

var/spack/repos/builtin/packages/eospac/package.py

@@ -22,19 +22,9 @@ class Eospac(Package):
     #   previous stable release will appear first as a new beta.
     # - alpha and beta versions are marked with 'deprecated=True' to help
     #   spack's version comparison.
-    version(
-        "6.5.9",
-        preferred=True,
-        sha256="54df29b1dc3b35c654ef2ebfbfa42d960a230cfb2d3c04a75ba93d3a789a312a",
-        url="https://laws.lanl.gov/projects/data/eos/get_file.php?package=eospac&filename=eospac_v6.5.9_4c633156bacc7b721bdd2735e40e09984a4d60a3.tgz",
-    )
-    version(
-        "6.5.8",
-        sha256="4e2c5db150bf7f45b5615c034848b9256f8659bcde95f097e446c226c70c6d96",
-        url="https://laws.lanl.gov/projects/data/eos/get_file.php?package=eospac&filename=eospac_v6.5.8_052127ccd65148632bd1258764f455c692a4dfc1.tgz",
-    )
     version(
         "6.5.7",
+        preferred=True,
         sha256="e59bd449bf97ce977309c6fc8a54fa30f4db9b2ca3e21f996095d78e23799e42",
         url="https://laws.lanl.gov/projects/data/eos/get_file.php?package=eospac&filename=eospac_v6.5.7_9a867a15ae4137d22e1b52199d6a46b486fc4376.tgz",
     )

var/spack/repos/builtin/packages/exago/package.py

@@ -156,7 +156,7 @@ class Exago(CMakePackage, CudaPackage, ROCmPackage):
     # This is duplicated from HiOp
     # RAJA > 0.14 and Umpire > 6.0 require c++ std 14
     # We are working on supporting newer Umpire/RAJA versions
-    depends_on("raja@0.14.0:0.14 +shared", when="@1.1.0:+raja")
+    depends_on("raja@0.14.0:0.14", when="@1.1.0:+raja")
     depends_on("umpire@6.0.0:6", when="@1.1.0:+raja")
     depends_on("camp@0.2.3:0.2", when="@1.1.0:+raja")
     # This is no longer a requirement in RAJA > 0.14

var/spack/repos/builtin/packages/exodusii/package.py

@@ -31,9 +31,6 @@ class Exodusii(CMakePackage):
     license("BSD-3-Clause")
 
     version("master", branch="master")
-    version(
-        "2024-04-03", sha256="72b095bae64b2b6c232630f79de763c6ade00c9b1199fc6980800891b2ab3751"
-    )
     version(
         "2024-03-11", sha256="5d417aa652e4ec8d66e27714c63b8cb5a7f878fb7b2ec55f629636fcff7c0f00"
     )
@@ -62,61 +59,39 @@ class Exodusii(CMakePackage):
         "2022-01-27", sha256="d21c14b9b30f773cef8e2029773f3cc35da021eebe9060298231f95021eb814f"
     )
     version(
-        "2021-10-11",
-        sha256="5c04d252e1c4a10b037aa352b89487e581ec6b52bdb46e9e85f101bbdcd9c388",
-        deprecated=True,
+        "2021-10-11", sha256="5c04d252e1c4a10b037aa352b89487e581ec6b52bdb46e9e85f101bbdcd9c388"
     )
     version(
-        "2021-04-05",
-        sha256="f40d318674753287b8b28d2b4e5cca872cd772d4c7383af4a8f3eeb48fcc7ec0",
-        deprecated=True,
+        "2021-04-05", sha256="f40d318674753287b8b28d2b4e5cca872cd772d4c7383af4a8f3eeb48fcc7ec0"
     )
     version(
-        "2021-04-02",
-        sha256="811037a68eaff0daf9f34bd31b2ab1c9b8f028dfcb998ab01fbcb80d9458257c",
-        deprecated=True,
+        "2021-04-02", sha256="811037a68eaff0daf9f34bd31b2ab1c9b8f028dfcb998ab01fbcb80d9458257c"
     )
     version(
-        "2021-01-20",
-        sha256="6ff7c3f0651138f2e2305b5270108ca45f96346a739b35a126a0a260c91cbe64",
-        deprecated=True,
+        "2021-01-20", sha256="6ff7c3f0651138f2e2305b5270108ca45f96346a739b35a126a0a260c91cbe64"
     )
     version(
-        "2021-01-06",
-        sha256="69cafef17d8e624c2d9871f3a281ff3690116a6f82162fe5c1507bb4ecd6a32a",
-        deprecated=True,
+        "2021-01-06", sha256="69cafef17d8e624c2d9871f3a281ff3690116a6f82162fe5c1507bb4ecd6a32a"
     )
     version(
-        "2020-08-13",
-        sha256="5b128a8ad9b0a69cff4fe937828d6d1702f1fe8aa80d4751e6522939afe62957",
-        deprecated=True,
+        "2020-08-13", sha256="5b128a8ad9b0a69cff4fe937828d6d1702f1fe8aa80d4751e6522939afe62957"
     )
     version(
-        "2020-05-12",
-        sha256="0402facf6cf23d903d878fb924b5d57e9f279dead5b92cf986953a6b91a6e81f",
-        deprecated=True,
+        "2020-05-12", sha256="0402facf6cf23d903d878fb924b5d57e9f279dead5b92cf986953a6b91a6e81f"
     )
     version(
-        "2020-03-16",
-        sha256="ed1d42c8c657931ecd45367a465cf9c00255772d9cd0811fc9baacdb67fc71fa",
-        deprecated=True,
+        "2020-03-16", sha256="ed1d42c8c657931ecd45367a465cf9c00255772d9cd0811fc9baacdb67fc71fa"
     )
     version(
-        "2020-01-16",
-        sha256="db69dca25595e88a40c00db0ccf2afed1ecd6008ba30bb478a4e1c5dd61998b8",
-        deprecated=True,
+        "2020-01-16", sha256="db69dca25595e88a40c00db0ccf2afed1ecd6008ba30bb478a4e1c5dd61998b8"
     )
     version(
-        "2019-12-18",
-        sha256="88a71de836aa26fd63756cf3ffbf3978612edc5b6c61fa8de32fe9d638007774",
-        deprecated=True,
+        "2019-12-18", sha256="88a71de836aa26fd63756cf3ffbf3978612edc5b6c61fa8de32fe9d638007774"
     )
     version(
-        "2019-10-14",
-        sha256="f143d90e8a7516d25979d1416e580dea638332db723f26ae94a712dfe4052e8f",
-        deprecated=True,
+        "2019-10-14", sha256="f143d90e8a7516d25979d1416e580dea638332db723f26ae94a712dfe4052e8f"
     )
-    version("2016-08-09", commit="2ffeb1bd39454ad5aa230e12969ce976f3d1c92b", deprecated=True)
+    version("2016-08-09", commit="2ffeb1bd39454ad5aa230e12969ce976f3d1c92b")
 
     patch("Fix-ioss-tpl.patch", when="@2021-10-11:")
 

var/spack/repos/builtin/packages/flux-core/package.py

@@ -22,7 +22,6 @@ class FluxCore(AutotoolsPackage):
     license("LGPL-3.0-only")
 
     version("master", branch="master")
-    version("0.61.0", sha256="02cedc6abb12816cbb01f2195c1acf7b6552c1d8b9029f899148df48a7cd05e2")
     version("0.60.0", sha256="f96025204a20f94c2821db47fe010b2c19e076ef93281ac7d308e82853e135ff")
     version("0.59.0", sha256="465d24294b92962d156ad49768ea804ff848d5c0b3470d80e07ebf24cd255f2d")
     version("0.58.0", sha256="3125ace7d4d3c99b362290344f97db74c06c37b5510cfcb746e1bf48e1dc1389")

var/spack/repos/builtin/packages/fmt/fmt-no-variable-initialize_10.0.0.patch

@@ -1,22 +0,0 @@
-diff --git a/include/fmt/format.h b/include/fmt/format.h
-index 7637c8a0..c9d7b6cc 100644
---- a/include/fmt/format.h
-+++ b/include/fmt/format.h
-@@ -1332,7 +1332,7 @@ template <typename Char, typename UInt, typename Iterator,
- FMT_CONSTEXPR inline auto format_decimal(Iterator out, UInt value, int size)
-     -> format_decimal_result<Iterator> {
-   // Buffer is large enough to hold all digits (digits10 + 1).
--  Char buffer[digits10<UInt>() + 1] = {};
-+  Char buffer[digits10<UInt>() + 1];
-   auto end = format_decimal(buffer, value, size).end;
-   return {out, detail::copy_str_noinline<Char>(buffer, end, out)};
- }
-@@ -1359,7 +1359,7 @@ FMT_CONSTEXPR inline auto format_uint(It out, UInt value, int num_digits,
-     return out;
-   }
-   // Buffer should be large enough to hold all digits (digits / BASE_BITS + 1).
--  char buffer[num_bits<UInt>() / BASE_BITS + 1] = {};
-+  char buffer[num_bits<UInt>() / BASE_BITS + 1];
-   format_uint<BASE_BITS>(buffer, value, num_digits, upper);
-   return detail::copy_str_noinline<Char>(buffer, buffer + num_digits, out);
- }

var/spack/repos/builtin/packages/fmt/package.py

@@ -94,14 +94,6 @@ class Fmt(CMakePackage):
         when="@10.0.0:10.1.1",
     )
 
-    # Fix 'variable "buffer" may not be initialized' compiler error
-    patch(
-        "fmt-no-variable-initialize_10.0.0.patch", when="@10.0.0:10.2.1%clang@12.0.1.ibm.gcc.8.3.1"
-    )
-    patch(
-        "fmt-no-variable-initialize_10.0.0.patch", when="@10.0.0:10.2.1%clang@14.0.5.ibm.gcc.8.3.1"
-    )
-
     def cmake_args(self):
         spec = self.spec
         args = []

var/spack/repos/builtin/packages/gdb/package.py

@@ -85,7 +85,6 @@ class Gdb(AutotoolsPackage, GNUMirrorPackage):
     depends_on("xz", when="+xz")
     depends_on("zlib-api")
     depends_on("zstd", when="@13.1:")
-    depends_on("pkgconfig", type="build", when="@13.1:")
     depends_on("source-highlight", when="+source-highlight")
     depends_on("ncurses", when="+tui")
     depends_on("gmp", when="@11.1:")

var/spack/repos/builtin/packages/ginkgo/1.4.0_dpcpp_use_old_standard.patch

@@ -0,0 +1,70 @@
+commit 83164570f0d3511d114114bcc2b02ad23b753ed0
+Author: Yuhsiang M. Tsai <yhmtsai@gmail.com>
+Date:   Wed Oct 6 16:33:16 2021 +0200
+
+    syclstd 1.2.1 in new release to propagate subgroup
+    remove 64 subgroup in dense to avoid conj_trans issue on cpu temporarily
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ceb269b1cb..b47388a596 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -67,7 +67,8 @@ if(MSVC)
+ elseif(GINKGO_BUILD_DPCPP OR CMAKE_CXX_COMPILER MATCHES "dpcpp")
+     # For now always use `-ffp-model=precise` with DPC++. This can be removed when
+     # the floating point issues are fixed.
+-    set(GINKGO_COMPILER_FLAGS "-Wpedantic;-ffp-model=precise" CACHE STRING
++    # -sycl-std=1.2.1 (or -sycl-std=2017) is temporary workaround after 2021.4 to propagate subgroup setting correctly
++    set(GINKGO_COMPILER_FLAGS "-Wpedantic;-ffp-model=precise;-sycl-std=1.2.1" CACHE STRING
+         "Set the required CXX compiler flags, mainly used for warnings. Current default is `-Wpedantic;-ffp-model=precise`")
+ else()
+     set(GINKGO_COMPILER_FLAGS "-Wpedantic" CACHE STRING
+diff --git a/cmake/create_test.cmake b/cmake/create_test.cmake
+index 9d22406f9a..dcc452b293 100644
+--- a/cmake/create_test.cmake
++++ b/cmake/create_test.cmake
+@@ -40,6 +40,7 @@ function(ginkgo_create_dpcpp_test test_name)
+     add_executable(${test_target_name} ${test_name}.dp.cpp)
+     target_compile_features(${test_target_name} PUBLIC cxx_std_17)
+     target_compile_options(${test_target_name} PRIVATE "${GINKGO_DPCPP_FLAGS}")
++    target_compile_options(${test_target_name} PRIVATE "${GINKGO_COMPILER_FLAGS}")
+     target_link_options(${test_target_name} PRIVATE -fsycl-device-code-split=per_kernel)
+     ginkgo_set_test_target_properties(${test_name} ${test_target_name})
+     # Note: MKL_ENV is empty on linux. Maybe need to apply MKL_ENV to all test.
+diff --git a/dpcpp/CMakeLists.txt b/dpcpp/CMakeLists.txt
+index fee9ec3639..ce71fd5d3c 100644
+--- a/dpcpp/CMakeLists.txt
++++ b/dpcpp/CMakeLists.txt
+@@ -68,6 +68,7 @@ target_compile_definitions(ginkgo_dpcpp PRIVATE GKO_COMPILING_DPCPP)
+ 
+ set(GINKGO_DPCPP_FLAGS ${GINKGO_DPCPP_FLAGS} PARENT_SCOPE)
+ target_compile_options(ginkgo_dpcpp PRIVATE "${GINKGO_DPCPP_FLAGS}")
++target_compile_options(ginkgo_dpcpp PRIVATE "${GINKGO_COMPILER_FLAGS}")
+ # Note: add MKL as PRIVATE not PUBLIC (MKL example shows) to avoid propagating
+ # find_package(MKL) everywhere when linking ginkgo (see the MKL example
+ # https://software.intel.com/content/www/us/en/develop/documentation/onemkl-windows-developer-guide/top/getting-started/cmake-config-for-onemkl.html)
+diff --git a/dpcpp/matrix/dense_kernels.dp.cpp b/dpcpp/matrix/dense_kernels.dp.cpp
+index 0c89530d1d..9a86ab9cd1 100644
+--- a/dpcpp/matrix/dense_kernels.dp.cpp
++++ b/dpcpp/matrix/dense_kernels.dp.cpp
+@@ -69,14 +69,14 @@ namespace dpcpp {
+ namespace dense {
+ 
+ 
++// Disable the 64 subgroup. CPU supports 64 now, but conj_transpose will
++// lead CL_OUT_OF_RESOURCES. TODO: investigate this issue.
+ using KCFG_1D = ConfigSet<11, 7>;
+ constexpr auto kcfg_1d_list =
+-    syn::value_list<std::uint32_t, KCFG_1D::encode(512, 64),
+-                    KCFG_1D::encode(512, 32), KCFG_1D::encode(512, 16),
+-                    KCFG_1D::encode(256, 32), KCFG_1D::encode(256, 16),
+-                    KCFG_1D::encode(256, 8)>();
+-constexpr auto subgroup_list =
+-    syn::value_list<std::uint32_t, 64, 32, 16, 8, 4>();
++    syn::value_list<std::uint32_t, KCFG_1D::encode(512, 32),
++                    KCFG_1D::encode(512, 16), KCFG_1D::encode(256, 32),
++                    KCFG_1D::encode(256, 16), KCFG_1D::encode(256, 8)>();
++constexpr auto subgroup_list = syn::value_list<std::uint32_t, 32, 16, 8, 4>();
+ constexpr auto kcfg_1d_array = syn::as_array(kcfg_1d_list);
+ constexpr int default_block_size = 256;
+ 

var/spack/repos/builtin/packages/ginkgo/ginkgo-dpcpp-intrinsincs-oneapi-2024.1.patch

@@ -1,19 +0,0 @@
-diff -ruN spack-src/dpcpp/components/intrinsics.dp.hpp spack-src-patched/dpcpp/components/intrinsics.dp.hpp
---- spack-src/dpcpp/components/intrinsics.dp.hpp	2024-04-03 18:53:42.724032846 +0000
-+++ spack-src-patched/dpcpp/components/intrinsics.dp.hpp	2024-04-03 18:55:01.744543032 +0000
-@@ -67,13 +67,13 @@
-  */
- __dpct_inline__ int ffs(uint32 mask)
- {
--    return (mask == 0) ? 0 : (sycl::ext::intel::ctz(mask) + 1);
-+    return (mask == 0) ? 0 : (sycl::ctz(mask) + 1);
- }
- 
- /** @copydoc ffs */
- __dpct_inline__ int ffs(uint64 mask)
- {
--    return (mask == 0) ? 0 : (sycl::ext::intel::ctz(mask) + 1);
-+    return (mask == 0) ? 0 : (sycl::ctz(mask) + 1);
- }
- 
- 

var/spack/repos/builtin/packages/ginkgo/package.py

@@ -106,9 +106,6 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage):
     # https://github.com/ginkgo-project/ginkgo/pull/1524
     patch("ginkgo-sycl-pr1524.patch", when="@1.7.0 +sycl %oneapi@2024:")
 
-    # https://github.com/ginkgo-project/ginkgo/pull/1585
-    patch("ginkgo-dpcpp-intrinsincs-oneapi-2024.1.patch", when="@1.7.0 +sycl %oneapi@2024.1:")
-
     # Skip smoke tests if compatible hardware isn't found
     patch("1.4.0_skip_invalid_smoke_tests.patch", when="@1.4.0")
 
@@ -121,7 +118,7 @@ def setup_build_environment(self, env):
             env.set("MKLROOT", join_path(spec["intel-oneapi-mkl"].prefix, "mkl", "latest"))
             env.set("DPL_ROOT", join_path(spec["intel-oneapi-dpl"].prefix, "dpl", "latest"))
             # The `IntelSYCLConfig.cmake` is broken with spack. By default, it
-            # relies on the CMAKE_CXX_COMPILER being the real ipcx
+            # relies on the CMAKE_CXX_COMPILER being the real ipcx/dpcpp
             # compiler. If not, the variable SYCL_COMPILER of that script is
             # broken, and all the SYCL detection mechanism is wrong. We fix it
             # by giving hint environment variables.
@@ -200,9 +197,9 @@ def cmake_args(self):
                 )
 
         if "+sycl" in self.spec:
-            sycl_compatible_compilers = ["icpx"]
+            sycl_compatible_compilers = ["dpcpp", "icpx"]
             if not (os.path.basename(self.compiler.cxx) in sycl_compatible_compilers):
-                raise InstallError("ginkgo +sycl requires icpx compiler.")
+                raise InstallError("ginkgo +sycl requires DPC++ (dpcpp) or icpx compiler.")
         return args
 
     @property

var/spack/repos/builtin/packages/hypre/package.py

@@ -286,10 +286,11 @@ def configure_args(self):
 
         if spec.satisfies("+sycl"):
             configure_args.append("--with-sycl")
-            sycl_compatible_compilers = ["icpx"]
+            sycl_compatible_compilers = ["dpcpp", "icpx"]
             if not (os.path.basename(self.compiler.cxx) in sycl_compatible_compilers):
                 raise InstallError(
-                    "Hypre's SYCL GPU Backend requires the oneAPI CXX (icpx) compiler."
+                    "Hypre's SYCL GPU Backend requires DPC++ (dpcpp)"
+                    + " or the oneAPI CXX (icpx) compiler."
                 )
 
         if spec.satisfies("+unified-memory"):

var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py

@@ -223,7 +223,10 @@
 
 @IntelOneApiPackage.update_description
 class IntelOneapiCompilers(IntelOneApiPackage):
-    """Intel oneAPI Compilers. Includes: icc, icpc, ifort, icx, icpx, and ifx."""
+    """Intel oneAPI Compilers. Includes: icc, icpc, ifort, icx, icpx, ifx,
+    and dpcpp.
+
+    """
 
     maintainers("rscohn2")
 

var/spack/repos/builtin/packages/kokkos/package.py

@@ -64,6 +64,7 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage):
     conflicts("+openmptarget", when="@:3.5")
 
     # https://github.com/spack/spack/issues/29052
+    conflicts("@:3.5 +sycl", when="%dpcpp@2022:")
     conflicts("@:3.5 +sycl", when="%oneapi@2022:")
 
     tpls_variants = {

var/spack/repos/builtin/packages/magma/package.py

@@ -13,9 +13,9 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage):
     current "Multicore+GPU" systems.
     """
 
-    homepage = "https://icl.utk.edu/magma/"
+    homepage = "https://icl.cs.utk.edu/magma/"
     git = "https://bitbucket.org/icl/magma"
-    url = "https://icl.utk.edu/projectsfiles/magma/downloads/magma-2.2.0.tar.gz"
+    url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-2.2.0.tar.gz"
     maintainers("stomov", "luszczek", "G-Ragghianti")
 
     tags = ["e4s"]
@@ -23,7 +23,6 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage):
     test_requires_compiler = True
 
     version("master", branch="master")
-    version("2.8.0", sha256="f4e5e75350743fe57f49b615247da2cc875e5193cc90c11b43554a7c82cc4348")
     version("2.7.2", sha256="729bc1a70e518a7422fe7a3a54537a4741035a77be3349f66eac5c362576d560")
     version("2.7.1", sha256="d9c8711c047a38cae16efde74bee2eb3333217fd2711e1e9b8606cbbb4ae1a50")
     version("2.7.0", sha256="fda1cbc4607e77cacd8feb1c0f633c5826ba200a018f647f1c5436975b39fd18")
@@ -48,10 +47,6 @@ class Magma(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("cuda@8:", when="@2.5.1: +cuda")  # See PR #14471
     depends_on("hipblas", when="+rocm")
     depends_on("hipsparse", when="+rocm")
-    # This ensures that rocm-core matches the hip package version in the case that
-    # hip is an external package.
-    for ver in ["5.5.0", "5.5.1", "5.6.0", "5.6.1", "5.7.0", "5.7.1", "6.0.0", "6.0.2"]:
-        depends_on(f"rocm-core@{ver}", when=f"@2.8.0: +rocm ^hip@{ver}")
     depends_on("python", when="@master", type="build")
 
     conflicts("~cuda", when="~rocm", msg="magma: Either CUDA or HIP support must be enabled")
@@ -155,8 +150,6 @@ def cmake_args(self):
             # See https://github.com/ROCm/rocFFT/issues/322
             if spec.satisfies("^cmake@3.21.0:3.21.2"):
                 options.append(define("__skip_rocmclang", True))
-            if spec.satisfies("@2.8.0:"):
-                options.append(define("ROCM_CORE", spec["rocm-core"].prefix))
         else:
             options.append(define("MAGMA_ENABLE_CUDA", True))
 

var/spack/repos/builtin/packages/onednn/package.py

@@ -85,6 +85,7 @@ class Onednn(CMakePackage):
             "tbb",
             "seq",
             conditional("threadpool", when="@1.4:"),
+            conditional("dpcpp", when="@2:"),
             conditional("sycl", when="@2:"),
         ),
         multi=False,
@@ -93,7 +94,7 @@ class Onednn(CMakePackage):
         "gpu_runtime",
         default="none",
         description="Runtime to use for GPU engines",
-        values=("ocl", "none", conditional("sycl", when="@2:")),
+        values=("ocl", "none", conditional("dpcpp", when="@2:"), conditional("sycl", when="@2:")),
         multi=False,
     )
     variant(

var/spack/repos/builtin/packages/parthenon/package.py

@@ -1,75 +0,0 @@
-# Copyright 2013-2024 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 Parthenon(CMakePackage):
-    """A performance portable block-structured adaptive mesh refinement framework."""
-
-    homepage = "https://github.com/parthenon-hpc-lab/parthenon"
-    git = "https://github.com/parthenon-hpc-lab/parthenon.git"
-    url = "https://github.com/parthenon-hpc-lab/parthenon/archive/v0.8.0.tar.gz"
-    maintainers("pbrady", "pgrete")
-
-    version("develop", branch="develop")
-    version("24.03", sha256="ec9109c6bf442237641e627f301567527eb5e756b6959b6747d35315d041727c")
-    version("23.11", sha256="76f79fb7d6556d94052829a8ac71f53cbda76f37fabd9233c5c0cd47ef561aee")
-    version("0.8.0", sha256="9ed7c9ebdc84927a43b86c1e061f925b57cef9b567c7275f22779ed4d98e858d")
-
-    # ------------------------------------------------------------#
-    # Variants
-    # ------------------------------------------------------------#
-
-    variant("single", default=False, description="Run in single precision")
-    variant("mpi", default=True, description="Enable mpi")
-    variant(
-        "host_comm_buffers", default=False, description="Allocate communication buffers on host"
-    )
-    variant("hdf5", default=True, description="Enable hdf5")
-    with when("+hdf5"):
-        variant(
-            "compression",
-            default=True,
-            description="Enable compression in hdf5 output/restart files",
-        )
-    variant("sparse", default=True, description="Sparse capability")
-    variant("ascent", default=False, description="Enable Ascent for in-situ vis and analysis")
-    variant("examples", default=False, description="Build example drivers")
-    variant("python", default=False, description="Enable python for testing")
-    variant(
-        "pressure", default=False, description="Registry pressure check for Kokkos CUDA kernels"
-    )
-
-    # ------------------------------------------------------------#
-    # Dependencies
-    # ------------------------------------------------------------#
-
-    depends_on("cmake@3.16:", type="build")
-
-    depends_on("mpi", when="+mpi")
-    depends_on("hdf5", when="+hdf5")
-    depends_on("hdf5 +mpi", when="+mpi +hdf5")
-    depends_on("ascent", when="+ascent")
-    depends_on("python@3.5:", when="+python")
-    depends_on("kokkos@4:")
-
-    def cmake_args(self):
-        spec = self.spec
-        return [
-            self.define("PARTHENON_IMPORT_KOKKOS", True),
-            self.define_from_variant("PARTHENON_SINGLE_PRECISION", "single"),
-            self.define_from_variant("PARTHENON_ENABLE_HOST_COMM_BUFFERS", "host_comm_buffers"),
-            self.define_from_variant("CHECK_REGISTRY_PRESSURE", "pressure"),
-            self.define_from_variant("PARTHENON_ENABLE_ASCENT", "ascent"),
-            self.define("PARTHENON_DISABLE_MPI", not spec.variants["mpi"].value),
-            self.define("PARTHENON_DISABLE_HDF5", not spec.variants["hdf5"].value),
-            self.define(
-                "PARTHENON_DISABLE_HDF5_COMPRESSION", not spec.variants["compression"].value
-            ),
-            self.define("PARTHENON_DISABLE_SPARSE", not spec.variants["sparse"].value),
-            self.define("PARTHENON_DISABLE_EXAMPLES", not spec.variants["examples"].value),
-            self.define("BUILD_TESTING", self.run_tests),
-        ]

var/spack/repos/builtin/packages/py-a2wsgi/package.py

@@ -15,9 +15,16 @@ class PyA2wsgi(PythonPackage):
 
     license("Apache-2.0")
 
-    version("1.7.0", sha256="a906f62c0250eb0201120b93417dd0b12b105b5db35af431bfe86ef0dc5bbab2")
-    version("1.6.0", sha256="67a9902db6da72c268a24d4e5d01348f736980a577279b7df801c8902aba8554")
+    version(
+        "1.7.0",
+        sha256="d26be288b2a5f368181b6e0d1cfc3c2a4180732cca10e9cc4b9bc333235b8d80",
+        url="https://pypi.org/packages/c5/b8/ccf880c8a3e564283f0ed1b4268e13e4cb9075491b0863f9a2bf83d5e58a/a2wsgi-1.7.0-py3-none-any.whl",
+    )
+    version(
+        "1.6.0",
+        sha256="ee8507d07fd86b781d3e039fe458366e2127bd2251b47fcbedadbf013095a21e",
+        url="https://pypi.org/packages/b2/fb/4bb5451ee0a98194267a99acb060f9113c9b13796020c1a63eadd637acdb/a2wsgi-1.6.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.6.2:", type=("build", "run"))
-
-    depends_on("py-pdm-pep517@1.0.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.7:", when="@1.7")

var/spack/repos/builtin/packages/py-about-time/package.py

@@ -16,9 +16,21 @@ class PyAboutTime(PythonPackage):
 
     license("MIT")
 
-    version("4.2.1", sha256="6a538862d33ce67d997429d14998310e1dbfda6cb7d9bbfbf799c4709847fece")
-    version("4.1.0", sha256="963b1f3739b0c9732eb205031762b76f1291d89b5d0c8220a8d5b154e32ce650")
-    version("3.1.1", sha256="586b329450c9387d1ae8c42d2db4f5b4c57a54508d0f1b7bb00322ffd5ce9f9b")
+    version(
+        "4.2.1",
+        sha256="8bbf4c75fe13cbd3d72f49a03b02c5c7dca32169b6d49117c257e7eb3eaee341",
+        url="https://pypi.org/packages/fb/cd/7ee00d6aa023b1d0551da0da5fee3bc23c3eeea632fbfc5126d1fec52b7e/about_time-4.2.1-py3-none-any.whl",
+    )
+    version(
+        "4.1.0",
+        sha256="fdf24423c4322ee32fa1338ff4b11f704b649427110290f94bfe4e16ad246f18",
+        url="https://pypi.org/packages/fa/fe/d680887c70b9330741fb599bd0106500f9bc438c5995b516cac0d7ebfe50/about_time-4.1.0-py3-none-any.whl",
+    )
+    version(
+        "3.1.1",
+        sha256="96841beb3f9b5de1cbb323d2bdb0fa9abdecbc46f2d546b9b3c2483d23daa17a",
+        url="https://pypi.org/packages/bc/3e/97d324a2161da150d5d8f979ffce526ebbb938dbaf9536caaf0c4efe3680/about_time-3.1.1-py3-none-any.whl",
+    )
 
-    depends_on("python@3.7:3", type=("build", "run"), when="@4:")
-    depends_on("py-setuptools", type="build")
+    with default_args(type="run"):
+        depends_on("python@3.7:3", when="@4:")

var/spack/repos/builtin/packages/py-accelerate/package.py

@@ -16,14 +16,23 @@ class PyAccelerate(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.21.0", sha256="e2959a0bf74d97c0b3c0e036ed96065142a060242281d27970d4c4e34f11ca59")
-    version("0.16.0", sha256="d13e30f3e6debfb46cada7b931af85560619b6a6a839d0cafeeab6ed7c6a498d")
+    version(
+        "0.21.0",
+        sha256="e2609d37f2c6a56e36a0612feae6ff6d9daac9759f4899432b86b1dc97024ebb",
+        url="https://pypi.org/packages/70/f9/c381bcdd0c3829d723aa14eec8e75c6c377b4ca61ec68b8093d9f35fc7a7/accelerate-0.21.0-py3-none-any.whl",
+    )
+    version(
+        "0.16.0",
+        sha256="27aa39b2076560b3ee674b9650c237c58520b3fd7907e5da1f922cf6868c1576",
+        url="https://pypi.org/packages/dc/0c/f95215bc5f65e0a5fb97d4febce7c18420002a4c3ea5182294dc576f17fb/accelerate-0.16.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.8.0:", when="@0.21.0:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
-    depends_on("py-numpy@1.17:", type=("build", "run"))
-    depends_on("py-packaging@20:", type=("build", "run"))
-    depends_on("py-psutil", type=("build", "run"))
-    depends_on("py-pyyaml", type=("build", "run"))
-    depends_on("py-torch@1.10.0:", when="@0.21.0:", type=("build", "run"))
-    depends_on("py-torch@1.4:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.8:", when="@0.21:")
+        depends_on("python@3.7:", when="@0.10:0.20")
+        depends_on("py-numpy@1.17.0:")
+        depends_on("py-packaging@20:", when="@0.10:")
+        depends_on("py-psutil", when="@0.10:")
+        depends_on("py-pyyaml")
+        depends_on("py-torch@1.10:", when="@0.21:")
+        depends_on("py-torch@1.4:", when="@:0.18")

var/spack/repos/builtin/packages/py-accessible-pygments/package.py

@@ -15,7 +15,11 @@ class PyAccessiblePygments(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("0.0.4", sha256="e7b57a9b15958e9601c7e9eb07a440c813283545a20973f2574a5f453d0e953e")
+    version(
+        "0.0.4",
+        sha256="416c6d8c1ea1c5ad8701903a20fcedf953c6e720d64f33dc47bfb2d3f2fa4e8d",
+        url="https://pypi.org/packages/20/d7/45cfa326d945e411c7e02764206845b05f8f5766aa7ebc812ef3bc4138cd/accessible_pygments-0.0.4-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-pygments@1.5:", type=("build", "run"))
-    depends_on("py-setuptools", type=("build"))
+    with default_args(type="run"):
+        depends_on("py-pygments@1.5:")

var/spack/repos/builtin/packages/py-acme-tiny/package.py

@@ -14,8 +14,8 @@ class PyAcmeTiny(PythonPackage):
 
     license("MIT")
 
-    version("master", branch="master")
-    version("4.0.4", commit="5350420d35177eda733d85096433a24e55f8d00e")
-
-    depends_on("py-setuptools", type=("build", "run"))
-    depends_on("py-setuptools-scm", type="build")
+    version(
+        "4.0.4",
+        sha256="70ab30bbbbcfadbf68ca47b4d991fe12cd5126574a6fb0ead7985f8885ee30b0",
+        url="https://pypi.org/packages/96/4f/19c6a31d6f520fdca0e2e03003c94d34b21a131ebe3b82da1953075e7bea/acme_tiny-4.0.4-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-adal/package.py

@@ -19,10 +19,14 @@ class PyAdal(PythonPackage):
 
     license("MIT")
 
-    version("1.2.4", sha256="7a15d22b1ee7ce1be92441199958748982feba6b7dec35fbf60f9b607bad1bc0")
+    version(
+        "1.2.4",
+        sha256="b332316f54d947f39acd9628e7d61d90f6e54d413d6f97025a51482c96bac6bc",
+        url="https://pypi.org/packages/46/58/a19e0eb0c388fb7aced40f940c09069343862613d83095b592a8d3961ba1/adal-1.2.4-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-pyjwt@1.0.0:", type=("build", "run"))
-    depends_on("py-requests@2.0.0:", type=("build", "run"))
-    depends_on("py-python-dateutil@2.1.0:", type=("build", "run"))
-    depends_on("py-cryptography@1.1.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-cryptography@1.1:")
+        depends_on("py-pyjwt@1:", when="@:1.2.5")
+        depends_on("py-python-dateutil@2:", when="@:1.2.5")
+        depends_on("py-requests@2:", when="@:1.2.5")

var/spack/repos/builtin/packages/py-adb-enhanced/package.py

@@ -17,15 +17,19 @@ class PyAdbEnhanced(PythonPackage):
 
     license("Apache-2.0")
 
-    version("2.5.10", sha256="9e913d09814ce99974c455a766c5b616a92bca551e657517d6e079882eb19bdb")
-    version("2.5.4", sha256="329ee2e0cfceaa41c591398b365d9acdfd45ffe913c64ac06e1538041986fffb")
-    version("2.5.3", sha256="5a1d5182d1a073b440e862e5481c7a21073eccc3cda7a4774a2aa311fee9bbdc")
-    version("2.5.2", sha256="055676156c1566b8d952b9fdfdd89fc09f2d5d1e3b90b4cdf40858ce9947e2ca")
+    version(
+        "2.5.10",
+        sha256="19e9462702d1d20ee023686e128a43d15149411c7cd2838639df7d6df6d282ee",
+        url="https://pypi.org/packages/2b/ae/0515f15799a811d7e06c60ae4bcc7ac3df8f6c5024a8fb6093e0a0cc6d77/adb_enhanced-2.5.10-py3-none-any.whl",
+    )
+    version(
+        "2.5.4",
+        sha256="f8c4a1c4ee7ca82210b6f2472763c0239cd63c9c58c5b4b2b7d0edf3c7c5180e",
+        url="https://pypi.org/packages/fb/48/c9325bd726bebddf68f77da0d1ac90b6542c97121d008423f5d68f77e1ac/adb_enhanced-2.5.4-py3-none-any.whl",
+    )
 
-    depends_on("python@3:", type=("build", "run"))
-    depends_on("python@3.4:", when="@2.5.10:", type=("build", "run"))
-    depends_on("py-setuptools", type=("build", "run"))
-    depends_on("py-docopt", type=("build", "run"))
-    depends_on("py-future", when="@:2.5.4", type=("build", "run"))
-    depends_on("py-psutil", type=("build", "run"))
-    depends_on("py-asyncio", when="@:2.5.4", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-asyncio", when="@2.2:2.5.4")
+        depends_on("py-docopt")
+        depends_on("py-future", when="@:2.5.4")
+        depends_on("py-psutil")

var/spack/repos/builtin/packages/py-addict/package.py

@@ -16,6 +16,8 @@ class PyAddict(PythonPackage):
 
     license("MIT")
 
-    version("2.2.1", sha256="398bba9e7fa25e2ce144c5c4b8ec6208e89b9445869403dfa88ab66ec110fa12")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "2.2.1",
+        sha256="1948c2a5d93ba6026eb91aef2c971234aaf72488a9c07ab8a7950f82ae30eea7",
+        url="https://pypi.org/packages/14/6f/beb258220417c1a0fe11e842f2e012a1be7eeeaa72a1d10ba17a804da367/addict-2.2.1-py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-aenum/package.py

@@ -13,7 +13,13 @@ class PyAenum(PythonPackage):
     homepage = "https://github.com/ethanfurman/aenum"
     pypi = "aenum/aenum-2.1.2.tar.gz"
 
-    version("3.1.12", sha256="3e531c91860a81f885f7e6e97d219ae9772cb899580084788935dad7d9742ef0")
-    version("2.1.2", sha256="a3208e4b28db3a7b232ff69b934aef2ea1bf27286d9978e1e597d46f490e4687")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "3.1.12",
+        sha256="2d544ef7323c088d68abf9a84b9f3f6db0d516fec685e15678b5f84fdb7b8ba0",
+        url="https://pypi.org/packages/57/32/18862210ce170908bc19de5cbb3844b165679123b32fe119d4116e46c2c8/aenum-3.1.12-py3-none-any.whl",
+    )
+    version(
+        "2.1.2",
+        sha256="3df9b84cce5dc9ed77c337079f97b66c44c0053eb87d6f4d46b888dc45801e38",
+        url="https://pypi.org/packages/0d/46/5b6a6c13fee40f9dfaba84de1394bfe082c0c7d95952ba0ffbd56ce3a3f7/aenum-2.1.2-py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-affine/package.py

@@ -12,8 +12,10 @@ class PyAffine(PythonPackage):
     homepage = "https://github.com/sgillies/affine"
     url = "https://github.com/sgillies/affine/archive/2.1.0.zip"
 
-    depends_on("py-setuptools", type="build")
+    version(
+        "2.1.0",
+        sha256="ed8bc4b217ec051c07c2733bc60229a0dfd00d88bbe0b94db992e65a0d876bc4",
+        url="https://pypi.org/packages/c9/24/71214ac2b93db5b64775821ed32dd6f9da451d51dbb83cb0b66fa38acac7/affine-2.1.0-py3-none-any.whl",
+    )
 
     license("BSD-3-Clause")
-
-    version("2.1.0", sha256="b67b7dee9a9865185a931758a3e347ad8583d0ac985895b90985a477ccfa4745")

var/spack/repos/builtin/packages/py-agate-dbf/package.py

@@ -14,9 +14,17 @@ class PyAgateDbf(PythonPackage):
 
     license("MIT")
 
-    version("0.2.2", sha256="589682b78c5c03f2dc8511e6e3edb659fb7336cd118e248896bb0b44c2f1917b")
-    version("0.2.1", sha256="00c93c498ec9a04cc587bf63dd7340e67e2541f0df4c9a7259d7cb3dd4ce372f")
+    version(
+        "0.2.2",
+        sha256="632a8826ecde3dffb28f15e3ccb9d523bc15b79eb157f063f2febc2c4078957a",
+        url="https://pypi.org/packages/fc/75/32847937627c8fe2271606d71de85486ffaf01b28a091ecdc43e58876b1b/agate_dbf-0.2.2-py2.py3-none-any.whl",
+    )
+    version(
+        "0.2.1",
+        sha256="f618fadb413d41468c90d72fca945681d82d9e4d1b3d89f9bda52e607b828c0b",
+        url="https://pypi.org/packages/3d/d0/5a161b906a7eaa2b3d5690bbf0de5ceb4398e21d3e915f69869cfeef906f/agate_dbf-0.2.1-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-agate@1.5.0:", type=("build", "run"))
-    depends_on("py-dbfread@2.0.5:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-agate@1.5:", when="@0.2.2:")
+        depends_on("py-dbfread@2.0.5:", when="@0.2.2:")

var/spack/repos/builtin/packages/py-agate/package.py

@@ -16,13 +16,8 @@ class PyAgate(PythonPackage):
 
     license("MIT")
 
-    version("1.6.1", sha256="c93aaa500b439d71e4a5cf088d0006d2ce2c76f1950960c8843114e5f361dfd3")
-
-    depends_on("py-setuptools", type="build")
-    depends_on("py-six@1.9.0:", type=("build", "run"))
-    depends_on("py-pytimeparse@1.1.5:", type=("build", "run"))
-    depends_on("py-parsedatetime@2.1:", type=("build", "run"))
-    depends_on("py-babel@2.0:", type=("build", "run"))
-    depends_on("py-isodate@0.5.4:", type=("build", "run"))
-    depends_on("py-python-slugify@1.2.1:", type=("build", "run"))
-    depends_on("py-leather@0.3.2:", type=("build", "run"))
+    version(
+        "1.6.1",
+        sha256="48d6f80b35611c1ba25a642cbc5b90fcbdeeb2a54711c4a8d062ee2809334d1c",
+        url="https://pypi.org/packages/92/77/ef675f16486884ff7f77f3cb87aafa3429c6bb869d4d73ee23bf4675e384/agate-1.6.1-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-ahpy/package.py

@@ -16,9 +16,13 @@ class PyAhpy(PythonPackage):
 
     license("MIT")
 
-    version("2.0", sha256="f0af7b81b51466a055778d84f64c98f5cc3e1ba34aaeaedc48ba0b91008e40e3")
+    version(
+        "2.0",
+        sha256="266d6a9c8669f9950188e83620bae47dc9083e41592a91d6890c4e497f13cc44",
+        url="https://pypi.org/packages/ab/50/c0af318811c4dee0e72c04110f0d5d6a97df7a5cbd8dcec727d22d3456e4/ahpy-2.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.7:3", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
-    depends_on("py-numpy", type=("build", "run"))
-    depends_on("py-scipy", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.7:3")
+        depends_on("py-numpy")
+        depends_on("py-scipy")

var/spack/repos/builtin/packages/py-aiofiles/package.py

@@ -15,11 +15,18 @@ class PyAiofiles(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.7.0", sha256="a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4")
-    version("0.5.0", sha256="98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af")
+    version(
+        "0.7.0",
+        sha256="c67a6823b5f23fcab0a2595a289cec7d8c863ffcb4322fb8cd6b90400aedfdbc",
+        url="https://pypi.org/packages/e7/61/007ac6f27fe1c2dc44d3a62f429a8440de1601428b4d0291eae1a3494d1f/aiofiles-0.7.0-py3-none-any.whl",
+    )
+    version(
+        "0.5.0",
+        sha256="377fdf7815cc611870c59cbd07b68b180841d2a2b79812d8c218be02448c2acb",
+        url="https://pypi.org/packages/f4/2b/078a9771ae4b67e36b0c2a973df845260833a4eb088b81c84b738509b4c4/aiofiles-0.5.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.6:3", when="@0.7:", type=("build", "run"))
-    depends_on("py-poetry-core@1:", when="@0.7:", type="build")
+    with default_args(type="run"):
+        depends_on("python@:3", when="@0.7:0")
 
     # Historical dependencies
-    depends_on("py-setuptools", when="@:0.6", type="build")

var/spack/repos/builtin/packages/py-aiohttp-cors/package.py

@@ -16,8 +16,11 @@ class PyAiohttpCors(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.7.0", sha256="4d39c6d7100fd9764ed1caf8cebf0eb01bf5e3f24e2e073fda6234bc48b19f5d")
+    version(
+        "0.7.0",
+        sha256="0451ba59fdf6909d0e2cd21e4c0a43752bc0703d33fc78ae94d9d9321710193e",
+        url="https://pypi.org/packages/13/e7/e436a0c0eb5127d8b491a9b83ecd2391c6ff7dcd5548dfaec2080a2340fd/aiohttp_cors-0.7.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.4.1:", type=("build", "run"))
-    depends_on("py-setuptools@20.8.1:", type="build")
-    depends_on("py-aiohttp@1.1:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-aiohttp@1.1:", when="@0.5:0.5.0,0.5.2:")

var/spack/repos/builtin/packages/py-aioitertools/package.py

@@ -16,10 +16,17 @@ class PyAioitertools(PythonPackage):
 
     license("MIT")
 
-    version("0.11.0", sha256="42c68b8dd3a69c2bf7f2233bf7df4bb58b557bca5252ac02ed5187bbc67d6831")
-    version("0.7.1", sha256="54a56c7cf3b5290d1cb5e8974353c9f52c677612b5d69a859369a020c53414a3")
+    version(
+        "0.11.0",
+        sha256="04b95e3dab25b449def24d7df809411c10e62aab0cbe31a50ca4e68748c43394",
+        url="https://pypi.org/packages/45/66/d1a9fd8e6ff88f2157cb145dd054defb0fd7fe2507fe5a01347e7c690eab/aioitertools-0.11.0-py3-none-any.whl",
+    )
+    version(
+        "0.7.1",
+        sha256="8972308474c41ed5e0636819f948ebff32f2318e70f7e7d23cd208c4357cc773",
+        url="https://pypi.org/packages/32/0b/3260ac050de07bf6e91871944583bb8598091da19155c34f7ef02244709c/aioitertools-0.7.1-py3-none-any.whl",
+    )
 
-    depends_on("python@3.6:", type=("build", "run"))
-    depends_on("py-flit-core@2:3", type="build")
-    depends_on("py-typing-extensions@3.7:", when="@0.7.1", type=("build", "run"))
-    depends_on("py-typing-extensions@4:", when="@0.11.0: ^python@:3.9", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-typing-extensions@4:", when="@0.9: ^python@:3.9")
+        depends_on("py-typing-extensions@3.7:", when="@0.7")

var/spack/repos/builtin/packages/py-aioredis/package.py

@@ -15,9 +15,12 @@ class PyAioredis(PythonPackage):
 
     license("MIT")
 
-    version("1.3.1", sha256="15f8af30b044c771aee6787e5ec24694c048184c7b9e54c3b60c750a4b93273a")
+    version(
+        "1.3.1",
+        sha256="b61808d7e97b7cd5a92ed574937a079c9387fdadd22bfbfa7ad2fd319ecc26e3",
+        url="https://pypi.org/packages/b0/64/1b1612d0a104f21f80eb4c6e1b6075f2e6aba8e228f46f229cfd3fdac859/aioredis-1.3.1-py3-none-any.whl",
+    )
 
-    depends_on("python@3.5:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
-    depends_on("py-async-timeout", type=("build", "run"))
-    depends_on("py-hiredis", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-async-timeout", when="@1:")
+        depends_on("py-hiredis", when="@:1")

var/spack/repos/builtin/packages/py-aiosignal/package.py

@@ -15,8 +15,11 @@ class PyAiosignal(PythonPackage):
 
     license("Apache-2.0")
 
-    version("1.2.0", sha256="78ed67db6c7b7ced4f98e495e572106d5c432a93e1ddd1bf475e1dc05f5b7df2")
+    version(
+        "1.2.0",
+        sha256="26e62109036cd181df6e6ad646f91f0dcfd05fe16d0cb924138ff2ab75d64e3a",
+        url="https://pypi.org/packages/3b/87/fe94898f2d44a93a35d5aa74671ed28094d80753a1113d68b799fab6dc22/aiosignal-1.2.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.6:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
-    depends_on("py-frozenlist@1.1.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-frozenlist@1.1:", when="@1.1:")

var/spack/repos/builtin/packages/py-aiosqlite/package.py

@@ -14,11 +14,14 @@ class PyAiosqlite(PythonPackage):
 
     license("MIT")
 
-    version("0.17.0", sha256="f0e6acc24bc4864149267ac82fb46dfb3be4455f99fe21df82609cc6e6baee51")
+    version(
+        "0.17.0",
+        sha256="6c49dc6d3405929b1d08eeccc72306d3677503cc5e5e43771efc1e00232e8231",
+        url="https://pypi.org/packages/a0/48/77c0092f716c4bf9460dca44f5120f70b8f71f14a12f40d22551a7152719/aiosqlite-0.17.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.6:", type=("build", "run"))
-    depends_on("py-typing-extensions@3.7.2:", type=("build", "run"))
-    depends_on("py-flit-core@2:3", type="build")
+    with default_args(type="run"):
+        depends_on("py-typing-extensions@3.7:", when="@0.16:0.17")
 
     # aiosqlite.test requires aiounittests, not yet in spack
     import_modules = ["aiosqlite"]

var/spack/repos/builtin/packages/py-alabaster/package.py

@@ -14,9 +14,23 @@ class PyAlabaster(PythonPackage):
     pypi = "alabaster/alabaster-0.7.10.tar.gz"
     git = "https://github.com/sphinx-doc/alabaster.git"
 
-    version("0.7.13", sha256="a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2")
-    version("0.7.12", sha256="a661d72d58e6ea8a57f7a86e37d86716863ee5e92788398526d58b26a4e4dc02")
-    version("0.7.10", sha256="37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0")
-    version("0.7.9", sha256="47afd43b08a4ecaa45e3496e139a193ce364571e7e10c6a87ca1a4c57eb7ea08")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.7.13",
+        sha256="1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3",
+        url="https://pypi.org/packages/64/88/c7083fc61120ab661c5d0b82cb77079fc1429d3f913a456c1c82cf4658f7/alabaster-0.7.13-py3-none-any.whl",
+    )
+    version(
+        "0.7.12",
+        sha256="446438bdcca0e05bd45ea2de1668c1d9b032e1a9154c2c259092d77031ddd359",
+        url="https://pypi.org/packages/10/ad/00b090d23a222943eb0eda509720a404f531a439e803f6538f35136cae9e/alabaster-0.7.12-py2.py3-none-any.whl",
+    )
+    version(
+        "0.7.10",
+        sha256="2eef172f44e8d301d25aff8068fddd65f767a3f04b5f15b0f4922f113aa1c732",
+        url="https://pypi.org/packages/2e/c3/9b7dcd8548cf2c00531763ba154e524af575e8f36701bacfe5bcadc67440/alabaster-0.7.10-py2.py3-none-any.whl",
+    )
+    version(
+        "0.7.9",
+        sha256="d3e64a74919373d6d4d1d36bd717206584cb64cbb0532dfce3bc2081cba6817b",
+        url="https://pypi.org/packages/5d/da/2e59e6b040f1062843eb9e874f504bc6779053b77da5d1ed7f1b46618e13/alabaster-0.7.9-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-alive-progress/package.py

@@ -16,12 +16,19 @@ class PyAliveProgress(PythonPackage):
 
     license("MIT")
 
-    version("2.4.1", sha256="089757c8197f27ad972ba27e1060f6db92368d83c736884e159034fd74865323")
-    version("1.6.2", sha256="642e1ce98becf226c8c36bf24e10221085998c5465a357a66fb83b7dc618b43e")
+    version(
+        "2.4.1",
+        sha256="5503ffca0a0607d5f0d24d3b10a718fe50e375470fa07602b246333eb7ec88ee",
+        url="https://pypi.org/packages/e4/01/7a6bcf3eb3fb030fac47854a984dcc488304af15721df33ce827f25158d1/alive_progress-2.4.1-py3-none-any.whl",
+    )
+    version(
+        "1.6.2",
+        sha256="0f1111f56b1b870f5e5edd57e89fc97dc1ca0a73eb5c5a09533494c7e850a818",
+        url="https://pypi.org/packages/cc/5c/d63b13cc0bd945b4a9b16e921cc00c5657143f68da4f296bb628b8d1ff17/alive_progress-1.6.2-py3-none-any.whl",
+    )
 
-    depends_on("python@2.7:3.8", type=("build", "run"))
-    depends_on("python@3.6:3", type=("build", "run"), when="@2:")
-    depends_on("python@3.7:3", type=("build", "run"), when="@2.2:")
-    depends_on("py-setuptools", type="build")
-    depends_on("py-about-time@3.1.1", type=("build", "run"), when="@2.4.1:")
-    depends_on("py-grapheme@0.6.0", type=("build", "run"), when="@2.4.1:")
+    with default_args(type="run"):
+        depends_on("python@3.7:3", when="@2.2:")
+        depends_on("python@:3", when="@:2.1")
+        depends_on("py-about-time@3.1.1:3.1", when="@2")
+        depends_on("py-grapheme@0.6:", when="@2:")

var/spack/repos/builtin/packages/py-alpaca-eval/package.py

@@ -18,13 +18,17 @@ class PyAlpacaEval(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.2.8", sha256="5b21b74d7362ee229481b6a6d826dd620b2ef6b82e4f5470645e0a4b696a31e6")
+    version(
+        "0.2.8",
+        sha256="a83279fcccfb63b81a60a410b4165291a586b7efde8709ac5a1380917530ac4f",
+        url="https://pypi.org/packages/c9/35/f7d6eb3909fd36ecbf927186a2c23cd257c45dc95dd1314dc2169a7aa9d9/alpaca_eval-0.2.8-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("python@3.10:", type=("build", "run"))
-    depends_on("py-python-dotenv", type=("build", "run"))
-    depends_on("py-datasets", type=("build", "run"))
-    depends_on("py-openai", type=("build", "run"))
-    depends_on("py-pandas", type=("build", "run"))
-    depends_on("py-tiktoken@0.3.2:", type=("build", "run"))
-    depends_on("py-fire", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.10:")
+        depends_on("py-datasets")
+        depends_on("py-fire")
+        depends_on("py-openai", when="@:0.5.1")
+        depends_on("py-pandas")
+        depends_on("py-python-dotenv", when="@0.2.2:")
+        depends_on("py-tiktoken@0.3.2:")

var/spack/repos/builtin/packages/py-alpaca-farm/package.py

@@ -18,24 +18,28 @@ class PyAlpacaFarm(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.1.9", sha256="1039d33c814d0bbbcab6a0e77ed8e897992ad7107d5c4999d56bdad7e0b0a59f")
+    version(
+        "0.1.9",
+        sha256="24ba2fa007205a98f8c7208071e54edcf295a03bb2d19b71a1da27d27dafc537",
+        url="https://pypi.org/packages/15/40/c7098f4ebe1006e2b6843eebfd05f15431d5312dcc37efa785f4089a78d3/alpaca_farm-0.1.9-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("python@3.10:", type=("build", "run"))
-    depends_on("py-datasets", type=("build", "run"))
-    depends_on("py-einops", type=("build", "run"))
-    depends_on("py-nltk", type=("build", "run"))
-    depends_on("py-accelerate@0.18.0:", type=("build", "run"))
-    depends_on("py-tabulate", type=("build", "run"))
-    depends_on("py-transformers@4.26.0:", type=("build", "run"))
-    depends_on("py-statsmodels", type=("build", "run"))
-    depends_on("py-tiktoken@0.3.2:", type=("build", "run"))
-    depends_on("py-markdown", type=("build", "run"))
-    depends_on("py-scikit-learn", type=("build", "run"))
-    depends_on("py-sentencepiece", type=("build", "run"))
-    depends_on("py-pandas", type=("build", "run"))
-    depends_on("py-wandb", type=("build", "run"))
-    depends_on("py-torch@1.13.1:", type=("build", "run"))
-    depends_on("py-fire", type=("build", "run"))
-    depends_on("py-openai", type=("build", "run"))
-    depends_on("py-alpaca-eval@0.2.8:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.10:", when="@0.1.6:")
+        depends_on("py-accelerate@0.18:", when="@:0.1.9")
+        depends_on("py-alpaca-eval@0.2.8:", when="@0.1.9:0.1")
+        depends_on("py-datasets")
+        depends_on("py-einops")
+        depends_on("py-fire")
+        depends_on("py-markdown")
+        depends_on("py-nltk")
+        depends_on("py-openai")
+        depends_on("py-pandas")
+        depends_on("py-scikit-learn")
+        depends_on("py-sentencepiece")
+        depends_on("py-statsmodels")
+        depends_on("py-tabulate")
+        depends_on("py-tiktoken@0.3.2:")
+        depends_on("py-torch@1.13.1:")
+        depends_on("py-transformers@4.26:", when="@:0.1.9")
+        depends_on("py-wandb")

var/spack/repos/builtin/packages/py-altair/package.py

@@ -13,28 +13,62 @@ class PyAltair(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("5.2.0", sha256="2ad7f0c8010ebbc46319cc30febfb8e59ccf84969a201541c207bc3a4fa6cf81")
-    version("5.1.2", sha256="e5f52a71853a607c61ce93ad4a414b3d486cd0d46ac597a24ae8bd1ac99dd460")
-    version("5.1.1", sha256="ad6cd6983c8db69a34dd68e42653f6172b7fc3775b7190005107f1b4fc60d64d")
-    version("5.1.0", sha256="46d2b1a9fa29eeed24513262cb1de13a40d55c04580fc21799d5de3991fea8ff")
-    version("5.0.1", sha256="087d7033cb2d6c228493a053e12613058a5d47faf6a36aea3ff60305fd8b4cb0")
-    version("5.0.0", sha256="394c3d8be96f9cc90e15a0eee3634cc5b6f19e470fd2045759892623bd9a3fb2")
-    version("4.2.2", sha256="39399a267c49b30d102c10411e67ab26374156a84b1aeb9fcd15140429ba49c5")
-    version("4.2.1", sha256="4939fd9119c57476bf305af9ca0bd1aa7779b2450b874d3623660e879d0fcad1")
-    version("4.2.0", sha256="d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026")
+    version(
+        "5.2.0",
+        sha256="8c4888ad11db7c39f3f17aa7f4ea985775da389d79ac30a6c22856ab238df399",
+        url="https://pypi.org/packages/c5/e4/7fcceef127badbb0d644d730d992410e4f3799b295c9964a172f92a469c7/altair-5.2.0-py3-none-any.whl",
+    )
+    version(
+        "5.1.2",
+        sha256="7219708ec33c152e53145485040f428954ed15fd09b2a2d89e543e6d111dae7f",
+        url="https://pypi.org/packages/17/16/b12fca347ff9d062e3c44ad9641d2ec50364570a059f3078ada3a5119d7a/altair-5.1.2-py3-none-any.whl",
+    )
+    version(
+        "5.1.1",
+        sha256="bb421459b53c80ad45f2bd009c87da2a81165b8f7d5a90658e0fc1ffc741bf34",
+        url="https://pypi.org/packages/f2/b4/02a0221bd1da91f6e6acdf0525528db24b4b326a670a9048da474dfe0667/altair-5.1.1-py3-none-any.whl",
+    )
+    version(
+        "5.1.0",
+        sha256="af1d502fa27a400ab4c82c55a185b4eaa74f1146f619e53278ba19934e90510a",
+        url="https://pypi.org/packages/2b/40/ff33821bca16cac30f8d9c3244ac961416f40bf2d3261a1250aabda33a6f/altair-5.1.0-py3-none-any.whl",
+    )
+    version(
+        "5.0.1",
+        sha256="9f3552ed5497d4dfc14cf48a76141d8c29ee56eae2873481b4b28134268c9bbe",
+        url="https://pypi.org/packages/b2/20/5c3b89d6f8d9938325a9330793438389e0dc94c34d921f6da35ec62095f3/altair-5.0.1-py3-none-any.whl",
+    )
+    version(
+        "5.0.0",
+        sha256="e7deed321f61a3ec752186ae96e97b44a1353de142928c1934fb211e9f0bfe9e",
+        url="https://pypi.org/packages/2e/b8/49d377d9a7a85dc24e35d70384fc5ae7b19db6f8ee9d23d36337675c602e/altair-5.0.0-py3-none-any.whl",
+    )
+    version(
+        "4.2.2",
+        sha256="8b45ebeaf8557f2d760c5c77b79f02ae12aee7c46c27c06014febab6f849bc87",
+        url="https://pypi.org/packages/18/62/47452306e84d4d2e67f9c559380aeb230f5e6ca84fafb428dd36b96a99ba/altair-4.2.2-py3-none-any.whl",
+    )
+    version(
+        "4.2.1",
+        sha256="67e099a651c78028c4e135e3b5bd9680ed7dd928ca7b61c9c7376c58e41d2b02",
+        url="https://pypi.org/packages/17/18/1e20c890bc12dfdd633cc58d76101fd544cc8f58fc316f2f6e13c6a83af2/altair-4.2.1-py3-none-any.whl",
+    )
+    version(
+        "4.2.0",
+        sha256="0c724848ae53410c13fa28be2b3b9a9dcb7b5caa1a70f7f217bd663bb419935a",
+        url="https://pypi.org/packages/0a/fb/56aaac0c69d106e380ff868cd5bb6cccacf2b8917a8527532bc89804a52e/altair-4.2.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.7:", type=("build", "run"))
-    depends_on("py-setuptools@40.6:", type="build", when="@:4")
-    depends_on("py-entrypoints", type=("build", "run"), when="@2.0.0:4")
-
-    depends_on("py-hatchling", type=("build"), when="@5.0.0:")
-
-    depends_on("py-importlib-metadata", type=("build", "run"), when="@5.0.0:5.0")
-    depends_on("py-typing-extensions@4.0.1:", type=("build", "run"), when="@5.0.0: ^python@:3.10")
-    depends_on("py-jinja2", type=("build", "run"))
-    depends_on("py-jsonschema@3.0.0:", type=("build", "run"))
-    depends_on("py-numpy", type=("build", "run"))
-    depends_on("py-pandas@0.18:", type=("build", "run"))
-    depends_on("py-pandas@0.25:", type=("build", "run"), when="@5.1.0:")
-    depends_on("py-toolz", type=("build", "run"))
-    depends_on("py-packaging", type=("build", "run"), when="@5.1.0:")
+    with default_args(type="run"):
+        depends_on("python@3.8:", when="@5.1:")
+        depends_on("python@3.7:", when="@4.2:5.0")
+        depends_on("py-entrypoints", when="@:4")
+        depends_on("py-importlib-metadata", when="@5:5.0 ^python@:3.7")
+        depends_on("py-jinja2")
+        depends_on("py-jsonschema@3.0.0:", when="@4.2.0:5.0.0-rc2,5.0.0:")
+        depends_on("py-numpy")
+        depends_on("py-packaging", when="@5.1:")
+        depends_on("py-pandas@0.25.0:", when="@5.1:")
+        depends_on("py-pandas@0.18:", when="@4.1:5.0")
+        depends_on("py-toolz")
+        depends_on("py-typing-extensions@4.0.1:", when="@5: ^python@:3.10")

var/spack/repos/builtin/packages/py-altgraph/package.py

@@ -17,6 +17,8 @@ class PyAltgraph(PythonPackage):
 
     license("MIT")
 
-    version("0.16.1", sha256="ddf5320017147ba7b810198e0b6619bd7b5563aa034da388cea8546b877f9b0c")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.16.1",
+        sha256="d6814989f242b2b43025cba7161fc1b8fb487a62cd49c49245d6fd01c18ac997",
+        url="https://pypi.org/packages/0a/cc/646187eac4b797069e2e6b736f14cdef85dbe405c9bfc7803ef36e4f62ef/altgraph-0.16.1-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-ampltools/package.py

@@ -15,7 +15,11 @@ class PyAmpltools(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("0.4.6", sha256="d54b399c1d78d02e3f4023aa2335b57832deb7d31cdefe4e219e4f2a2bb19a83")
+    version(
+        "0.4.6",
+        sha256="a0c7a21a0492f6809bb866f9887b8ad29b28ce43ea0c2f564562eb883bca34e9",
+        url="https://pypi.org/packages/2e/ce/5d7ac093633c8b73e7bfdf34cee14b5dea44e322bf2c938acdfadbb0d735/ampltools-0.4.6-py3-none-any.whl",
+    )
 
-    depends_on("py-requests", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
+    with default_args(type="run"):
+        depends_on("py-requests")

var/spack/repos/builtin/packages/py-amqp/package.py

@@ -13,21 +13,38 @@ class PyAmqp(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("5.0.9", sha256="1e5f707424e544078ca196e72ae6a14887ce74e02bd126be54b7c03c971bef18")
-    version("5.0.1", sha256="9881f8e6fe23e3db9faa6cfd8c05390213e1d1b95c0162bc50552cad75bffa5f")
-    version("2.6.1", sha256="70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21")
-    version("2.5.2", sha256="77f1aef9410698d20eaeac5b73a87817365f457a507d82edf292e12cbb83b08d")
-    version("2.4.2", sha256="043beb485774ca69718a35602089e524f87168268f0d1ae115f28b88d27f92d7")
-    version("2.4.1", sha256="6816eed27521293ee03aa9ace300a07215b11fee4e845588a9b863a7ba30addb")
+    version(
+        "5.0.9",
+        sha256="9cd81f7b023fc04bbb108718fbac674f06901b77bfcdce85b10e2a5d0ee91be5",
+        url="https://pypi.org/packages/b9/80/76cc2ce4789c91394f43e0e78d86be5738b5223d106c11d78bacc260a559/amqp-5.0.9-py3-none-any.whl",
+    )
+    version(
+        "5.0.1",
+        sha256="a8fb8151eb9d12204c9f1784c0da920476077609fa0a70f2468001e3a4258484",
+        url="https://pypi.org/packages/6a/10/2d781823dd1366d7609148714e1a81af402c3c4d0ef52c1a1ac0716da9d0/amqp-5.0.1-py2.py3-none-any.whl",
+    )
+    version(
+        "2.6.1",
+        sha256="aa7f313fb887c91f15474c1229907a04dac0b8135822d6603437803424c0aa59",
+        url="https://pypi.org/packages/bc/90/bb5ce93521772f083cb2d7a413bb82eda5afc62b4192adb7ea4c7b4858b9/amqp-2.6.1-py2.py3-none-any.whl",
+    )
+    version(
+        "2.5.2",
+        sha256="6e649ca13a7df3faacdc8bbb280aa9a6602d22fd9d545336077e573a1f4ff3b8",
+        url="https://pypi.org/packages/fc/a0/6aa2a7923d4e82dda23db27711d565f0c4abf1570859f168e3d0975f1eb6/amqp-2.5.2-py2.py3-none-any.whl",
+    )
+    version(
+        "2.4.2",
+        sha256="35a3b5006ca00b21aaeec8ceea07130f07b902dd61bfe42815039835f962f5f1",
+        url="https://pypi.org/packages/42/ec/cbbaa8f75be8cbd019afb9d63258e2bdc95242f8c46a54bb90db5fef03bd/amqp-2.4.2-py2.py3-none-any.whl",
+    )
+    version(
+        "2.4.1",
+        sha256="16056c952e8029ce8db097edf0d7c2fe2ba9de15d30ba08aee2c5221273d8e23",
+        url="https://pypi.org/packages/27/32/5c8a0d355b247446eb73f89c0fa4a22c1832764c0cc9d2bc43b9256d9366/amqp-2.4.1-py2.py3-none-any.whl",
+    )
 
-    depends_on("python@2.7:2.8,3.5:", type=("build", "run"))
-    depends_on("python@3.6:", type=("build", "run"), when="@5.0.9:")
-
-    depends_on("py-setuptools", type="build")
-    depends_on("py-cython", type="build")
-
-    depends_on("py-vine@1.1.3:4", when="@2", type=("build", "run"))
-    depends_on("py-vine@5.0.0", when="@5.0.0:5", type=("build", "run"))
-
-    def setup_build_environment(self, env):
-        env.set("CELERY_ENABLE_SPEEDUPS", True)
+    with default_args(type="run"):
+        depends_on("py-vine@5.0.0:5.0", when="@5.0.1:5.0")
+        depends_on("py-vine@1.1.3:1", when="@2.5:2")
+        depends_on("py-vine@1.1.3:", when="@2.2:2.4")

var/spack/repos/builtin/packages/py-aniso8601/package.py

@@ -14,7 +14,13 @@ class PyAniso8601(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("9.0.1", sha256="72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973")
-    version("7.0.0", sha256="513d2b6637b7853806ae79ffaca6f3e8754bdd547048f5ccc1420aec4b714f1e")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "9.0.1",
+        sha256="1d2b7ef82963909e93c4f24ce48d4de9e66009a21bf1c1e1c85bdd0812fe412f",
+        url="https://pypi.org/packages/e3/04/e97c12dc034791d7b504860acfcdd2963fa21ae61eaca1c9d31245f812c3/aniso8601-9.0.1-py2.py3-none-any.whl",
+    )
+    version(
+        "7.0.0",
+        sha256="d10a4bf949f619f719b227ef5386e31f49a2b6d453004b21f02661ccc8670c7b",
+        url="https://pypi.org/packages/45/a4/b4fcadbdab46c2ec2d2f6f8b4ab3f64fd0040789ac7f065eba82119cd602/aniso8601-7.0.0-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-anndata/package.py

@@ -15,16 +15,19 @@ class PyAnndata(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("0.8.0", sha256="94d2cc6f76c0317c0ac28564e3092b313b7ad19c737d66701961f3e620b9066e")
+    version(
+        "0.8.0",
+        sha256="2a929360c3c893370865e8ee3d3b9d95ee93239da91bafc5bf5f3c306796746e",
+        url="https://pypi.org/packages/46/7f/ffe1546142d98ed55e7bb70eaedad92861d8e2ab07398ef7f06f4f46d06d/anndata-0.8.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.7:", type=("build", "run"))
-    depends_on("py-setuptools-scm", type="build")
-    depends_on("py-flit-core@3.4:3", type="build")
-    depends_on("py-importlib-metadata@0.7:", type=("build", "run"), when="^python@:3.7")
-    depends_on("py-pandas@1.1.1:", type=("build", "run"))
-    depends_on("py-numpy@1.16.5:", type=("build", "run"))
-    depends_on("py-scipy@1.4.1:", type=("build", "run"))
-    depends_on("py-h5py@3:", type=("build", "run"))
-    depends_on("py-natsort", type=("build", "run"))
-    depends_on("py-packaging@20:", type=("build", "run"))
-    depends_on("py-typing-extensions", when="^python@:3.7", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.7:", when="@0.8")
+        depends_on("py-h5py@3.0.0:", when="@0.8:0.10.5")
+        depends_on("py-importlib-metadata@0.7:", when="@:0.8 ^python@:3.7")
+        depends_on("py-natsort")
+        depends_on("py-numpy@1.16.5:", when="@0.7.6:0.10.5")
+        depends_on("py-packaging@20:", when="@0.7.6:")
+        depends_on("py-pandas@1.1.1:", when="@0.7.6:0.9.1")
+        depends_on("py-scipy@1.4.1:", when="@0.7.6:0.10.5")
+        depends_on("py-typing-extensions", when="@0.8 ^python@:3.7")

var/spack/repos/builtin/packages/py-annexremote/package.py

@@ -14,9 +14,16 @@ class PyAnnexremote(PythonPackage):
 
     license("GPL-3.0-only")
 
-    version("1.6.0", sha256="779a43e5b1b4afd294761c6587dee8ac68f453a5a8cc40f419e9ca777573ae84")
-    version("1.5.0", sha256="92f32b6f5461cbaeefe0c60b32f9c1e0c1dbe4e57b8ee425affb56f4060f64ef")
+    version(
+        "1.6.0",
+        sha256="bc5bd2e456d64679e33d71226705673ac213040f8ae495467e9629b550c2ca53",
+        url="https://pypi.org/packages/66/81/32d0563cd017cca305a8b8883abb177880cedde1385213a6b4b33cc07e45/annexremote-1.6.0-py3-none-any.whl",
+    )
+    version(
+        "1.5.0",
+        sha256="5aa99e37036c84547cc1f39eb3f99bf4079f1e5de1272b147e8dd32c0e14884f",
+        url="https://pypi.org/packages/cd/9c/ced3458fcd0bb048350b7048412f6fa732ca7c44f6389d68c15e96e8b216/annexremote-1.5.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3:", when="@1.6:", type="build")
-    depends_on("py-setuptools", type="build")
-    depends_on("py-future", when="@:1.5", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-future", when="@1.3:1.5")

var/spack/repos/builtin/packages/py-ansi2html/package.py

@@ -16,7 +16,8 @@ class PyAnsi2html(PythonPackage):
 
     license("LGPL-3.0-or-later")
 
-    version("1.6.0", sha256="0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596")
-
-    depends_on("py-setuptools", type="build")
-    depends_on("py-pip", type="build")
+    version(
+        "1.6.0",
+        sha256="9fa44ca8fb8c417a05a9af1c62e192694b0fcec269ab55f130b5b26e260d0b7c",
+        url="https://pypi.org/packages/c6/85/3a46be84afbb16b392a138cd396117f438c7b2e91d8dc327621d1ae1b5dc/ansi2html-1.6.0-py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-ansimarkup/package.py

@@ -16,9 +16,16 @@ class PyAnsimarkup(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("2.1.0", sha256="7b3e3d93fecc5b64d23a6e8eb96dbc8b0b576a211829d948afb397d241a8c51b")
-    version("1.5.0", sha256="96c65d75bbed07d3dcbda8dbede8c2252c984f90d0ca07434b88a6bbf345fad3")
+    version(
+        "2.1.0",
+        sha256="51ab9f3157125c53e93d8fd2e92df37dfa1757c9f2371ed48554e111c7d4401a",
+        url="https://pypi.org/packages/60/99/878823a360a0bd9ae034d39fe37f8fdd976de8da642c2ec608f093efc273/ansimarkup-2.1.0-py3-none-any.whl",
+    )
+    version(
+        "1.5.0",
+        sha256="3146ca74af5f69e48a9c3d41b31085c0d6378f803edeb364856d37c11a684acf",
+        url="https://pypi.org/packages/22/09/3ad81e40d752ef51a9a8c320c9385de0d98a4dad68c0e4f793befc610f56/ansimarkup-1.5.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-setuptools@61:", type="build", when="@2.1.0")
-    depends_on("py-colorama", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-colorama", when="@1.4.1:")

var/spack/repos/builtin/packages/py-ansiwrap/package.py

@@ -14,7 +14,8 @@ class PyAnsiwrap(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.8.4", sha256="ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7")
-
-    depends_on("py-setuptools", type="build")
-    depends_on("py-textwrap3@0.9.2:", type=("build", "run"))
+    version(
+        "0.8.4",
+        sha256="7b053567c88e1ad9eed030d3ac41b722125e4c1271c8a99ade797faff1f49fb1",
+        url="https://pypi.org/packages/03/50/43e775a63e0d632d9be3b3fa1c9b2cbaf3b7870d203655710a3426f47c26/ansiwrap-0.8.4-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-anytree/package.py

@@ -15,7 +15,11 @@ class PyAnytree(PythonPackage):
 
     license("Apache-2.0")
 
-    version("2.8.0", sha256="3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab")
+    version(
+        "2.8.0",
+        sha256="14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521",
+        url="https://pypi.org/packages/a8/65/be23d8c3ecd68d40541d49812cd94ed0f3ee37eb88669ca15df0e43daed1/anytree-2.8.0-py2.py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-six@1.9.0:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-six@1.9:", when="@2.5,2.7:2.7.0,2.7.3:2.8")

var/spack/repos/builtin/packages/py-apache-libcloud/package.py

@@ -14,6 +14,8 @@ class PyApacheLibcloud(PythonPackage):
 
     license("Apache-2.0")
 
-    version("1.2.1", sha256="b26b542c6c9785dd4e34892d87421ffa4c043335c1cba301a97a8d9748c423f2")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "1.2.1",
+        sha256="6506e51eefe24a0bc0e61699dae7f390e22105e14afc4ba18248748c66117419",
+        url="https://pypi.org/packages/2d/32/37c9a6373595e1f335872e0a3ea76420db9c3952e185daff851d209c3b5d/apache_libcloud-1.2.1-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-apeye-core/package.py

@@ -15,9 +15,12 @@ class PyApeyeCore(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("1.1.4", sha256="72bb89fed3baa647cb81aa28e1d851787edcbf9573853b5d2b5f87c02f50eaf5")
+    version(
+        "1.1.4",
+        sha256="084bc696448d3ac428fece41c1f2eb08fa9d9ce1d1b2f4d43187e3def4528a60",
+        url="https://pypi.org/packages/f4/af/7cfe2c5e01d70848ac1731c8ab37e0e49ab39cf18e595446c192349639c0/apeye_core-1.1.4-py3-none-any.whl",
+    )
 
-    depends_on("py-hatch-requirements-txt", type="build")
-    depends_on("py-hatchling", type="build")
-    depends_on("py-domdf-python-tools@2.6:", type=("build", "run"))
-    depends_on("py-idna@2.5:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-domdf-python-tools@2.6:")
+        depends_on("py-idna@2.5:")

var/spack/repos/builtin/packages/py-apeye/package.py

@@ -15,10 +15,14 @@ class PyApeye(PythonPackage):
 
     license("LGPL-3.0-or-later")
 
-    version("1.4.1", sha256="14ea542fad689e3bfdbda2189a354a4908e90aee4bf84c15ab75d68453d76a36")
+    version(
+        "1.4.1",
+        sha256="44e58a9104ec189bf42e76b3a7fe91e2b2879d96d48e9a77e5e32ff699c9204e",
+        url="https://pypi.org/packages/89/7b/2d63664777b3e831ac1b1d8df5bbf0b7c8bee48e57115896080890527b1b/apeye-1.4.1-py3-none-any.whl",
+    )
 
-    depends_on("py-flit-core@3.2:3", type="build")
-    depends_on("py-apeye-core@1:", type=("build", "run"))
-    depends_on("py-domdf-python-tools@2.6:", type=("build", "run"))
-    depends_on("py-platformdirs@2.3:", type=("build", "run"))
-    depends_on("py-requests@2.24:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-apeye-core@1.0.0-beta2:", when="@1.3:")
+        depends_on("py-domdf-python-tools@2.6:", when="@1.2:")
+        depends_on("py-platformdirs@2.3:", when="@1.2:")
+        depends_on("py-requests@2.24:")

var/spack/repos/builtin/packages/py-apipkg/package.py

@@ -13,9 +13,13 @@ class PyApipkg(PythonPackage):
 
     license("MIT")
 
-    version("1.5", sha256="37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6")
-    version("1.4", sha256="2e38399dbe842891fe85392601aab8f40a8f4cc5a9053c326de35a1cc0297ac6")
-
-    depends_on("py-setuptools@30.3.0:", type="build")
-    depends_on("py-setuptools-scm", type="build")
-    depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
+    version(
+        "1.5",
+        sha256="58587dd4dc3daefad0487f6d9ae32b4542b185e1c36db6993290e7c41ca2b47c",
+        url="https://pypi.org/packages/67/08/4815a09603fc800209431bec5b8bd2acf2f95abdfb558a44a42507fb94da/apipkg-1.5-py2.py3-none-any.whl",
+    )
+    version(
+        "1.4",
+        sha256="65d2aa68b28e7d31233bb2ba8eb31cda40e4671f8ac2d6b241e358c9652a74b9",
+        url="https://pypi.org/packages/94/72/fd4f2e46ce7b0d388191c819ef691c8195fab09602bbf1a2f92aa5351444/apipkg-1.4-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-apispec/package.py

@@ -15,10 +15,17 @@ class PyApispec(PythonPackage):
 
     license("MIT")
 
-    version("6.0.2", sha256="e76d80b739edef4be213092a6384ad7fd933ba7d64f6d5a0aff8d4da1bef7887")
-    version("4.7.1", sha256="79029486d36a0d7f3c659dbf6ae50a91fbed0c22dcd5376f592e076c130bc7f9")
+    version(
+        "6.0.2",
+        sha256="d97f0ae9c65133185b9ed9c5be1a434eb85627dfa33c4c53cabda122256c1b67",
+        url="https://pypi.org/packages/06/05/397d3da7d64c095d38d75b95aacd76d22f7491184f7e2910e8ce79f068f8/apispec-6.0.2-py3-none-any.whl",
+    )
+    version(
+        "4.7.1",
+        sha256="6613dbc39f41cd58942a697f11c8762ba18422bd173fe0bdfc1535b83d3f84f0",
+        url="https://pypi.org/packages/3f/5b/312dd28e8e0b94dfe3c41db5a5c83a944c938a2108d631613fa0bbe3c8f7/apispec-4.7.1-py2.py3-none-any.whl",
+    )
 
-    depends_on("python@3.7:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
-
-    depends_on("py-packaging@21.3:", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("python@3.7:", when="@5.2:6.3")
+        depends_on("py-packaging@21.3:", when="@6:")

var/spack/repos/builtin/packages/py-appdirs/decode-appdirs.patch

@@ -1,21 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 293c1c4..122cd04 100644
---- a/setup.py
-+++ b/setup.py
-@@ -2,6 +2,7 @@
- import sys
- import os
- import os.path
-+from io import open
- # appdirs is a dependency of setuptools, so allow installing without it.
- try:
-     from setuptools import setup
-@@ -15,7 +16,7 @@ if sys.version_info < (2, 7):
- 
- 
- def read(fname):
--    inf = open(os.path.join(os.path.dirname(__file__), fname))
-+    inf = open(os.path.join(os.path.dirname(__file__), fname), encoding='utf8')
-     out = "\n" + inf.read().replace("\r\n", "\n")
-     inf.close()
-     return out

var/spack/repos/builtin/packages/py-appdirs/package.py

@@ -15,10 +15,18 @@ class PyAppdirs(PythonPackage):
 
     license("MIT")
 
-    version("1.4.4", sha256="7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41")
-    version("1.4.3", sha256="9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92")
-    version("1.4.0", sha256="8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5")
-
-    patch("setuptools-import.patch", when="@:1.4.0")
-    patch("decode-appdirs.patch", when="@1.4.4")
-    depends_on("py-setuptools", type="build")
+    version(
+        "1.4.4",
+        sha256="a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128",
+        url="https://pypi.org/packages/3b/00/2344469e2084fb287c2e0b57b72910309874c3245463acd6cf5e3db69324/appdirs-1.4.4-py2.py3-none-any.whl",
+    )
+    version(
+        "1.4.3",
+        sha256="d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e",
+        url="https://pypi.org/packages/56/eb/810e700ed1349edde4cbdc1b2a21e28cdf115f9faf263f6bbf8447c1abf3/appdirs-1.4.3-py2.py3-none-any.whl",
+    )
+    version(
+        "1.4.0",
+        sha256="85e58578db8f29538f3109c11250c2a5514a2fcdc9890d9b2fe777eb55517736",
+        url="https://pypi.org/packages/7b/8b/eebc6e2002a1e0383f1c7108d0111d4d33ea93bf417d7e19e43ec9b87b2b/appdirs-1.4.0-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-appdirs/setuptools-import.patch

@@ -1,17 +0,0 @@
-diff --git a/setup.py b/setup.py
-index ccd1e72..5d907aa 100644
---- a/setup.py
-+++ b/setup.py
-@@ -2,7 +2,11 @@
- import sys
- import os
- import os.path
--from setuptools import setup
-+# appdirs is a dependency of setuptools, so allow installing without it.
-+try:
-+    from setuptools import setup
-+except ImportError:
-+    from distutils.core import setup
- import appdirs
-
- tests_require = []

var/spack/repos/builtin/packages/py-applicationinsights/package.py

@@ -28,6 +28,8 @@ class PyApplicationinsights(PythonPackage):
 
     license("MIT")
 
-    version("0.11.9", sha256="30a11aafacea34f8b160fbdc35254c9029c7e325267874e3c68f6bdbcd6ed2c3")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.11.9",
+        sha256="b88bc5a41385d8e516489128d5e63f8c52efe597a3579b1718d1ab2f7cf150a2",
+        url="https://pypi.org/packages/a1/53/234c53004f71f0717d8acd37876e0b65c121181167057b9ce1b1795f96a0/applicationinsights-0.11.9-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-appnope/package.py

@@ -12,7 +12,13 @@ class PyAppnope(PythonPackage):
     homepage = "https://github.com/minrk/appnope"
     pypi = "appnope/appnope-0.1.0.tar.gz"
 
-    version("0.1.3", sha256="02bd91c4de869fbb1e1c50aafc4098827a7a54ab2f39d9dcba6c9547ed920e24")
-    version("0.1.0", sha256="8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.1.3",
+        sha256="265a455292d0bd8a72453494fa24df5a11eb18373a60c7c0430889f22548605e",
+        url="https://pypi.org/packages/41/4a/381783f26df413dde4c70c734163d88ca0550a1361cb74a1c68f47550619/appnope-0.1.3-py2.py3-none-any.whl",
+    )
+    version(
+        "0.1.0",
+        sha256="5b26757dc6f79a3b7dc9fab95359328d5747fcb2409d331ea66d0272b90ab2a0",
+        url="https://pypi.org/packages/87/a9/7985e6a53402f294c8f0e8eff3151a83f1fb901fa92909bb3ff29b4d22af/appnope-0.1.0-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-archspec/package.py

@@ -17,10 +17,26 @@ class PyArchspec(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.2.3", sha256="d07deb5b6e2ab3b74861e217523d02e69be8522f6e6565f4cc5d2062eb1a5d2c")
-    version("0.2.2", sha256="d922c9fd80a5234d8cef883fbe0e146b381c449062c0405f91714ebad1edc035")
-    version("0.2.1", sha256="0974a8a95831d2d43cce906c5b79a35d5fd2bf9be478b0e3b7d83ccc51ac815e")
-    version("0.2.0", sha256="6aaba5ebdb5c3633c400d8c221a6a18716da0c64b367a8509f4217b22e91a5f5")
+    version(
+        "0.2.3",
+        sha256="1b76fe2e75ee8750f0aac8c728af4beca1a95bdb5df246f4d39263664d6d301f",
+        url="https://pypi.org/packages/36/a6/7f0f500ce427b19c25f8cc05ee8cff9fb635373d62ae39e446d6f789e882/archspec-0.2.3-py3-none-any.whl",
+    )
+    version(
+        "0.2.2",
+        sha256="1054b599abb66f4d141c7a278dd34beb5766b1c84c7595aab3907a5bf55ee258",
+        url="https://pypi.org/packages/57/c1/45410841aaafe218632cfb9ae946eb4007ac8b5136bcae2987f0f56c7f56/archspec-0.2.2-py3-none-any.whl",
+    )
+    version(
+        "0.2.1",
+        sha256="e135481fc8384141ea2a18df9843045951717d8d029d60474a65d7d89b210821",
+        url="https://pypi.org/packages/63/ae/333e7d216dda9134558ddc30792d96bfc58968ff5cc69b4ad9e02dfac654/archspec-0.2.1-py3-none-any.whl",
+    )
+    version(
+        "0.2.0",
+        sha256="6e820d5afc45fe051b7f2c07aa2ede68ea55ae67c27ba78ca795da8e3671f9cc",
+        url="https://pypi.org/packages/9d/94/4c7f18613a052d5fbcb58bb1f938d3b1a04874c1464bfb63a26fe24435aa/archspec-0.2.0-py3-none-any.whl",
+    )
 
-    depends_on("py-poetry-core@1.0.0:", type="build")
-    depends_on("py-click@8", type=("build", "run"), when="@:0.2.0")
+    with default_args(type="run"):
+        depends_on("py-click@8.0.0:", when="@0.2:0.2.0")

var/spack/repos/builtin/packages/py-arcp/package.py

@@ -15,6 +15,8 @@ class PyArcp(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.2.1", sha256="5c17ac7972c9ef82979cc2caf2b3a87c1aefd3fefe9adb8a5dd728ada57715dd")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.2.1",
+        sha256="4e09b2d8a9fc3fda7ec112b553498ff032ea7de354e27dbeb1acc53667122444",
+        url="https://pypi.org/packages/66/df/32574bc8f1d440d40f4aaf3b455316b2b1536c7243c985a90f8516cf3074/arcp-0.2.1-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-argcomplete/package.py

@@ -12,21 +12,36 @@ class PyArgcomplete(PythonPackage):
     homepage = "https://github.com/kislyuk/argcomplete"
     pypi = "argcomplete/argcomplete-1.12.0.tar.gz"
 
-    version("3.1.2", sha256="d5d1e5efd41435260b8f85673b74ea2e883affcbec9f4230c582689e8e78251b")
-    version("3.0.8", sha256="b9ca96448e14fa459d7450a4ab5a22bbf9cee4ba7adddf03e65c398b5daeea28")
-    version("2.0.0", sha256="6372ad78c89d662035101418ae253668445b391755cfe94ea52f1b9d22425b20")
-    version("1.12.3", sha256="2c7dbffd8c045ea534921e63b0be6fe65e88599990d8dc408ac8c542b72a5445")
-    version("1.12.0", sha256="2fbe5ed09fd2c1d727d4199feca96569a5b50d44c71b16da9c742201f7cc295c")
-    version("1.1.1", sha256="cca45b5fe07000994f4f06a0b95bd71f7b51b04f81c3be0b4ea7b666e4f1f084")
-
-    depends_on("py-setuptools@67.7.2:", when="@3.1:", type="build")
-    depends_on("py-setuptools", type="build")
-    depends_on("py-setuptools-scm+toml@6.2:", when="@3.1:", type="build")
-
-    depends_on("py-importlib-metadata@0.23:6", when="@3.0.6: ^python@:3.7", type=("build", "run"))
-    depends_on(
-        "py-importlib-metadata@0.23:4", when="@1.12.3:2 ^python@:3.7", type=("build", "run")
+    version(
+        "3.1.2",
+        sha256="d97c036d12a752d1079f190bc1521c545b941fda89ad85d15afa909b4d1b9a99",
+        url="https://pypi.org/packages/1e/05/223116a4a5905d6b26bff334ffc7b74474fafe23fcb10532caf0ef86ca69/argcomplete-3.1.2-py3-none-any.whl",
     )
-    depends_on("py-importlib-metadata@0.23:3", when="@1.12.2 ^python@:3.7", type=("build", "run"))
-    depends_on("py-importlib-metadata@0.23:2", when="@1.12.1 ^python@:3.7", type=("build", "run"))
-    depends_on("py-importlib-metadata@0.23:1", when="@1.12.0 ^python@:3.7", type=("build", "run"))
+    version(
+        "3.0.8",
+        sha256="e36fd646839933cbec7941c662ecb65338248667358dd3d968405a4506a60d9b",
+        url="https://pypi.org/packages/ab/ce/2141e1cabe39c90e01fde7feb44c07867fb49bf1c0c091d68fd8924fd6a2/argcomplete-3.0.8-py3-none-any.whl",
+    )
+    version(
+        "2.0.0",
+        sha256="cffa11ea77999bb0dd27bb25ff6dc142a6796142f68d45b1a26b11f58724561e",
+        url="https://pypi.org/packages/d3/e5/c5509683462e51b070df9e83e7f72c1ccfe3f733f328b4a0f06804c27278/argcomplete-2.0.0-py2.py3-none-any.whl",
+    )
+    version(
+        "1.12.3",
+        sha256="291f0beca7fd49ce285d2f10e4c1c77e9460cf823eef2de54df0c0fec88b0d81",
+        url="https://pypi.org/packages/b7/9e/9dc74d330c07866d72f62d553fe8bdbe32786ff247a14e68b5659963e6bd/argcomplete-1.12.3-py2.py3-none-any.whl",
+    )
+    version(
+        "1.12.0",
+        sha256="91dc7f9c7f6281d5a0dce5e73d2e33283aaef083495c13974a7dd197a1cdc949",
+        url="https://pypi.org/packages/89/4d/b8e035cca2c9b2484ac12d20e0fb68019e17f0b09918f2765e0a381127fb/argcomplete-1.12.0-py2.py3-none-any.whl",
+    )
+    version(
+        "1.1.1",
+        sha256="f9bb1e017aa61e52b28023936475963d97d62046a1f87e0f0dfc5a5b439949ff",
+        url="https://pypi.org/packages/b2/64/f622fc5e6a202f802343cf6363fe0ff6a1e7f99cd7e0184a71f038cdbb4e/argcomplete-1.1.1-py2.py3-none-any.whl",
+    )
+
+    with default_args(type="run"):
+        depends_on("py-importlib-metadata@0.23:6", when="@3.1:3.1.2 ^python@:3.7")

var/spack/repos/builtin/packages/py-argh/package.py

@@ -20,6 +20,8 @@ class PyArgh(PythonPackage):
 
     maintainers("dorton21")
 
-    version("0.26.2", sha256="e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65")
-
-    depends_on("py-setuptools", type="build")
+    version(
+        "0.26.2",
+        sha256="a9b3aaa1904eeb78e32394cd46c6f37ac0fb4af6dc488daa58971bdc7d7fcaf3",
+        url="https://pypi.org/packages/06/1c/e667a7126f0b84aaa1c56844337bf0ac12445d1beb9c8a6199a7314944bf/argh-0.26.2-py2.py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-argparse-dataclass/package.py

@@ -15,6 +15,11 @@ class PyArgparseDataclass(PythonPackage):
 
     license("MIT")
 
-    version("2.0.0", sha256="09ab641c914a2f12882337b9c3e5086196dbf2ee6bf0ef67895c74002cc9297f")
+    version(
+        "2.0.0",
+        sha256="3ffc8852a88d9d98d1364b4441a712491320afb91fb56049afd8a51d74bb52d2",
+        url="https://pypi.org/packages/b3/66/e6c0a808950ba5a4042e2fcedd577fc7401536c7db063de4d7c36be06f84/argparse_dataclass-2.0.0-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
+    with default_args(type="run"):
+        depends_on("python@3.8:", when="@2:")

var/spack/repos/builtin/packages/py-arrow/package.py

@@ -19,16 +19,38 @@ class PyArrow(PythonPackage):
 
     license("Apache-2.0")
 
-    version("1.2.3", sha256="3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1")
-    version("1.2.2", sha256="05caf1fd3d9a11a1135b2b6f09887421153b94558e5ef4d090b567b47173ac2b")
-    version("1.2.1", sha256="c2dde3c382d9f7e6922ce636bf0b318a7a853df40ecb383b29192e6c5cc82840")
-    version("0.16.0", sha256="92aac856ea5175c804f7ccb96aca4d714d936f1c867ba59d747a8096ec30e90a")
-    version("0.14.7", sha256="67f8be7c0cf420424bc62d8d7dc40b44e4bb2f7b515f9cc2954fb36e35797656")
-    version("0.14.1", sha256="2d30837085011ef0b90ff75aa0a28f5c7d063e96b7e76b6cbc7e690310256685")
+    version(
+        "1.2.3",
+        sha256="5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2",
+        url="https://pypi.org/packages/67/67/4bca5a595e2f89bff271724ddb1098e6c9e16f7f3d018d120255e3c30313/arrow-1.2.3-py3-none-any.whl",
+    )
+    version(
+        "1.2.2",
+        sha256="d622c46ca681b5b3e3574fcb60a04e5cc81b9625112d5fb2b44220c36c892177",
+        url="https://pypi.org/packages/36/e7/3043959c8e3e3d6e346b69417e85daa591f9c018b99c383cc3f316bbf269/arrow-1.2.2-py3-none-any.whl",
+    )
+    version(
+        "1.2.1",
+        sha256="6b2914ef3997d1fd7b37a71ce9dd61a6e329d09e1c7b44f4d3099ca4a5c0933e",
+        url="https://pypi.org/packages/f4/97/a6b394b0ee6c9a7f645308f3a205c6cfe4fc804aac1bf29e4aebb5cd5a16/arrow-1.2.1-py3-none-any.whl",
+    )
+    version(
+        "0.16.0",
+        sha256="98184d8dd3e5d30b96c2df4596526f7de679ccb467f358b82b0f686436f3a6b8",
+        url="https://pypi.org/packages/ed/d2/aa994f2d8dd442113c753041761dc0732a35def05538de48f61adb28642a/arrow-0.16.0-py2.py3-none-any.whl",
+    )
+    version(
+        "0.14.7",
+        sha256="4bfacea734ead51495dc47df00421ecfd4ca1f2c0fbe58b9a26eaeddedc31caf",
+        url="https://pypi.org/packages/b9/26/aff20e20eb4fc8f9cbe60434494b53b8cc327062585517461bfdff76125f/arrow-0.14.7-py2.py3-none-any.whl",
+    )
+    version(
+        "0.14.1",
+        sha256="e4c4157d9f5eb7f850ffdcedd0cc1454ff677881deee03434a5705dc19192042",
+        url="https://pypi.org/packages/51/4d/e0728a800636654fb9edc1ffde6ff505eec56bf87fdc3a861d8060b64193/arrow-0.14.1-py2.py3-none-any.whl",
+    )
 
-    depends_on("python@3.6:", type=("build", "run"), when="@1.2.1:")
-    depends_on("python@2.7:2.8,3.5:", type=("build", "run"), when="@:0.16.0")
-    depends_on("py-setuptools", type="build")
-    depends_on("py-python-dateutil", type=("build", "run"))
-    depends_on("py-typing-extensions", type=("build", "run"), when="@1.2.1: ^python@:3.7")
-    depends_on("py-python-dateutil@2.7.0:", type=("build", "run"), when="@1.2.1:")
+    with default_args(type="run"):
+        depends_on("py-python-dateutil@2.7:", when="@0.16:")
+        depends_on("py-python-dateutil", when="@0.14.3:0.15")
+        depends_on("py-typing-extensions", when="@1:1.2 ^python@:3.7")

var/spack/repos/builtin/packages/py-art/package.py

@@ -14,7 +14,8 @@ class PyArt(PythonPackage):
 
     license("MIT")
 
-    version("6.1", sha256="6ab3031e3b7710039e73497b0e750cadfe04d4c1279ce3a123500dbafb9e1b64")
-
-    depends_on("python@3.5:", type=("build", "run"))
-    depends_on("py-setuptools", type="build")
+    version(
+        "6.1",
+        sha256="159819c418001467f8d79616fa0814277deac97c8a363d1eb3e7c0a31526bfc3",
+        url="https://pypi.org/packages/fc/53/d8792ac2ebb494db0e0ba3ad3f0a9ee71144a5ced266441166f7d038a37e/art-6.1-py3-none-any.whl",
+    )

var/spack/repos/builtin/packages/py-arviz/package.py

@@ -16,13 +16,17 @@ class PyArviz(PythonPackage):
 
     license("Apache-2.0")
 
-    version("0.6.1", sha256="435edf8db49c41a8fa198f959e7581063006c49a4efdef4755bb778db6fd4f72")
+    version(
+        "0.6.1",
+        sha256="fa613e6f796501f352462c747638d7e1d7ae3e3ed36e665e547def1b2524602c",
+        url="https://pypi.org/packages/ec/8b/83472d660e004a69b8e7b3c1dd12a607167774097138445d0dda1a3590dc/arviz-0.6.1-py3-none-any.whl",
+    )
 
-    depends_on("py-setuptools", type="build")
-    depends_on("py-matplotlib@3.0:", type=("build", "run"))
-    depends_on("py-numpy@1.12:", type=("build", "run"))
-    depends_on("py-scipy@0.19:", type=("build", "run"))
-    depends_on("py-packaging", type=("build", "run"))
-    depends_on("py-pandas@0.23:", type=("build", "run"))
-    depends_on("py-xarray@0.11:", type=("build", "run"))
-    depends_on("py-netcdf4", type=("build", "run"))
+    with default_args(type="run"):
+        depends_on("py-matplotlib@3.0.0:", when="@:0.12")
+        depends_on("py-netcdf4", when="@:0.14")
+        depends_on("py-numpy@1.12.0:", when="@0.5:0.12")
+        depends_on("py-packaging", when="@0.6:")
+        depends_on("py-pandas@0.23.0:", when="@0.5:0.12")
+        depends_on("py-scipy@0.19:", when="@0.5:0.12")
+        depends_on("py-xarray@0.11:", when="@0.5:0.9")

var/spack/repos/builtin/packages/py-asdf-standard/package.py

@@ -16,11 +16,12 @@ class PyAsdfStandard(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("1.0.3", sha256="afd8ff9a70e7b17f6bcc64eb92a544867d5d4fe1f0076719142fdf62b96cfd44")
+    version(
+        "1.0.3",
+        sha256="1c628379c75f0663b6376a7e681d31b1b54391053e53447c9921fb04c26d41da",
+        url="https://pypi.org/packages/b1/3e/2873079563324cbc60a152be07a38c8595bcfe0cadda4db8a1a1c9b5b2a7/asdf_standard-1.0.3-py3-none-any.whl",
+    )
 
-    depends_on("python@3.8:", type=("build", "run"))
-
-    depends_on("py-setuptools@42:", type="build")
-    depends_on("py-setuptools-scm@3.4: +toml", type="build")
-
-    depends_on("py-importlib-resources@3:", type=("build", "run"), when="^python@:3.8")
+    with default_args(type="run"):
+        depends_on("python@3.8:", when="@1.0.2:1.0")
+        depends_on("py-importlib-resources@3:", when="@1.0.1:1.0 ^python@:3.8")

var/spack/repos/builtin/packages/py-asdf-transform-schemas/package.py

@@ -16,12 +16,13 @@ class PyAsdfTransformSchemas(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version("0.3.0", sha256="0cf2ff7b22ccb408fe58ddd9b2441a59ba73fe323e416d59b9e0a4728a7d2dd6")
+    version(
+        "0.3.0",
+        sha256="b0dbcae1bd15afea52d67209d8a75533c0ad3713e7e0eb55d968ff70393cc7fc",
+        url="https://pypi.org/packages/2a/f2/b184f660552be16a3bd00b5c70eeb3abff9d154ccfbb1c868482a9559de0/asdf_transform_schemas-0.3.0-py3-none-any.whl",
+    )
 
-    depends_on("python@3.8:", type=("build", "run"))
-
-    depends_on("py-setuptools@42:", type="build")
-    depends_on("py-setuptools-scm@3.4: +toml", type="build")
-
-    depends_on("py-asdf-standard@1.0.1:", type=("build", "run"))
-    depends_on("py-importlib-resources@3:", type=("build", "run"), when="^python@:3.8")
+    with default_args(type="run"):
+        depends_on("python@3.8:", when="@0.3:0.4")
+        depends_on("py-asdf-standard@1.0.1:", when="@0.2.1:0.4")
+        depends_on("py-importlib-resources@3:", when="@0.2.1:0.4 ^python@:3.8")