curl: new version 8.7.1

* add onednn package

* fix style

* Update var/spack/repos/builtin/packages/intel-oneapi-dnn/package.py

Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>

---------

Co-authored-by: Robert Cohn <rscohn2@gmail.com>
Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com>

.github/workflows/audit.yaml

@@ -43,7 +43,7 @@ jobs:
           . share/spack/setup-env.sh
           $(which spack) audit packages
           $(which spack) audit externals
-    - uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8
+    - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed
       if: ${{ inputs.with_coverage == 'true' }}
       with:
         flags: unittests,audits

.github/workflows/build-containers.yml

@@ -96,7 +96,7 @@ jobs:
         uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@2b51285047da1547ffb1b2203d8be4c0af6b1f20
+        uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb
 
       - name: Log in to GitHub Container Registry
         uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20

.github/workflows/style/requirements.txt

@@ -1,4 +1,4 @@
-black==24.3.0
+black==24.4.0
 clingo==5.7.1
 flake8==7.0.0
 isort==5.13.2

.github/workflows/unit_tests.yaml

@@ -91,7 +91,7 @@ jobs:
           UNIT_TEST_COVERAGE: ${{ matrix.python-version == '3.11' }}
       run: |
           share/spack/qa/run-unit-tests
-    - uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8
+    - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed
       with:
         flags: unittests,linux,${{ matrix.concretizer }}
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -124,7 +124,7 @@ jobs:
           COVERAGE: true
       run: |
           share/spack/qa/run-shell-tests
-    - uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8
+    - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed
       with:
         flags: shelltests,linux
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -185,7 +185,7 @@ jobs:
           SPACK_TEST_SOLVER: clingo
       run: |
           share/spack/qa/run-unit-tests
-    - uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8
+    - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed
       with:
         flags: unittests,linux,clingo
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -223,7 +223,7 @@ jobs:
         $(which spack) solve zlib
         common_args=(--dist loadfile --tx '4*popen//python=./bin/spack-tmpconfig python -u ./bin/spack python' -x)
         $(which spack) unit-test --verbose --cov --cov-config=pyproject.toml --cov-report=xml:coverage.xml "${common_args[@]}"
-    - uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8
+    - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed
       with:
         flags: unittests,macos
         token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/windows_python.yml

@@ -33,7 +33,7 @@ jobs:
         ./share/spack/qa/validate_last_exit.ps1
         coverage combine -a
         coverage xml
-    - uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8
+    - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed
       with:
         flags: unittests,windows
         token: ${{ secrets.CODECOV_TOKEN }}
@@ -59,7 +59,7 @@ jobs:
         ./share/spack/qa/validate_last_exit.ps1
         coverage combine -a
         coverage xml
-    - uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8
+    - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed
       with:
         flags: unittests,windows
         token: ${{ secrets.CODECOV_TOKEN }}

lib/spack/docs/requirements.txt

@@ -2,12 +2,12 @@ sphinx==7.2.6
 sphinxcontrib-programoutput==0.17
 sphinx_design==0.5.0
 sphinx-rtd-theme==2.0.0
-python-levenshtein==0.25.0
+python-levenshtein==0.25.1
 docutils==0.20.1
 pygments==2.17.2
 urllib3==2.2.1
 pytest==8.1.1
 isort==5.13.2
-black==24.3.0
+black==24.4.0
 flake8==7.0.0
 mypy==1.9.0

lib/spack/llnl/util/filesystem.py

@@ -1234,10 +1234,12 @@ def windows_sfn(path: os.PathLike):
     import ctypes
 
     k32 = ctypes.WinDLL("kernel32", use_last_error=True)
+    # Method with null values returns size of short path name
+    sz = k32.GetShortPathNameW(path, None, 0)
     # stub Windows types TCHAR[LENGTH]
-    TCHAR_arr = ctypes.c_wchar * len(path)
+    TCHAR_arr = ctypes.c_wchar * sz
     ret_str = TCHAR_arr()
-    k32.GetShortPathNameW(path, ret_str, len(path))
+    k32.GetShortPathNameW(path, ctypes.byref(ret_str), sz)
     return ret_str.value
 
 

lib/spack/spack/build_systems/cargo.py

@@ -16,7 +16,7 @@
 
 
 class CargoPackage(spack.package_base.PackageBase):
-    """Specialized class for packages built using a Makefiles."""
+    """Specialized class for packages built using cargo."""
 
     #: This attribute is used in UI queries that need to know the build
     #: system base class

lib/spack/spack/build_systems/makefile.py

@@ -21,7 +21,7 @@
 
 
 class MakefilePackage(spack.package_base.PackageBase):
-    """Specialized class for packages built using a Makefiles."""
+    """Specialized class for packages built using Makefiles."""
 
     #: This attribute is used in UI queries that need to know the build
     #: system base class

lib/spack/spack/solver/concretize.lp

@@ -891,12 +891,8 @@ error(100, "{0} variant '{1}' cannot have values '{2}' and '{3}' as they come fr
      Set1 < Set2, % see[1]
      build(node(ID, Package)).
 
-% variant_set is an explicitly set variant value. If it's not 'set',
-% we revert to the default value. If it is set, we force the set value
-attr("variant_value", PackageNode, Variant, Value)
- :- attr("node", PackageNode),
-    node_has_variant(PackageNode, Variant),
-    attr("variant_set", PackageNode, Variant, Value).
+:- attr("variant_set", node(ID, Package), Variant, Value),
+   not attr("variant_value", node(ID, Package), Variant, Value).
 
 % The rules below allow us to prefer default values for variants
 % whenever possible. If a variant is set in a spec, or if it is

lib/spack/spack/test/concretize.py

@@ -1350,6 +1350,22 @@ def test_reuse_installed_packages_when_package_def_changes(
         # Structure and package hash will be different without reuse
         assert root.dag_hash() != new_root_without_reuse.dag_hash()
 
+    @pytest.mark.only_clingo("Use case not supported by the original concretizer")
+    @pytest.mark.regression("43663")
+    def test_no_reuse_when_variant_condition_does_not_hold(self, mutable_database, mock_packages):
+        spack.config.set("concretizer:reuse", True)
+
+        # Install a spec for which the `version_based` variant condition does not hold
+        old = Spec("conditional-variant-pkg @1").concretized()
+        old.package.do_install(fake=True, explicit=True)
+
+        # Then explicitly require a spec with `+version_based`, which shouldn't reuse previous spec
+        new1 = Spec("conditional-variant-pkg +version_based").concretized()
+        assert new1.satisfies("@2 +version_based")
+
+        new2 = Spec("conditional-variant-pkg +two_whens").concretized()
+        assert new2.satisfies("@2 +two_whens +version_based")
+
     @pytest.mark.only_clingo("Use case not supported by the original concretizer")
     def test_reuse_with_flags(self, mutable_database, mutable_config):
         spack.config.set("concretizer:reuse", True)

lib/spack/spack/test/conftest.py

@@ -55,6 +55,7 @@
 import spack.util.gpg
 import spack.util.spack_yaml as syaml
 import spack.util.url as url_util
+import spack.version
 from spack.fetch_strategy import URLFetchStrategy
 from spack.util.pattern import Bunch
 
@@ -1440,6 +1441,15 @@ def mock_git_repository(git, tmpdir_factory):
     yield t
 
 
+@pytest.fixture(scope="function")
+def mock_git_test_package(mock_git_repository, mutable_mock_repo, monkeypatch):
+    # install a fake git version in the package class
+    pkg_class = spack.repo.PATH.get_pkg_class("git-test")
+    monkeypatch.delattr(pkg_class, "git")
+    monkeypatch.setitem(pkg_class.versions, spack.version.Version("git"), mock_git_repository.url)
+    return pkg_class
+
+
 @pytest.fixture(scope="session")
 def mock_hg_repository(tmpdir_factory):
     """Creates a very simple hg repository with two commits."""

lib/spack/spack/test/llnl/util/filesystem.py

@@ -912,7 +912,6 @@ def test_find_first_file(tmpdir, bfs_depth):
 
 
 def test_rename_dest_exists(tmpdir):
-
     @contextmanager
     def setup_test_files():
         a = tmpdir.join("a", "file1")
@@ -999,3 +998,40 @@ def setup_test_dirs():
         assert os.path.exists(link2)
         assert os.path.realpath(link2) == a
         shutil.rmtree(tmpdir.join("f"))
+
+
+@pytest.mark.skipif(sys.platform != "win32", reason="No-op on non Windows")
+def test_windows_sfn(tmpdir):
+    # first check some standard Windows locations
+    # we know require sfn names
+    # this is basically a smoke test
+    # ensure spaces are replaced + path abbreviated
+    assert fs.windows_sfn("C:\\Program Files (x86)") == "C:\\PROGRA~2"
+    # ensure path without spaces is still properly shortened
+    assert fs.windows_sfn("C:\\ProgramData") == "C:\\PROGRA~3"
+
+    # test user created paths
+    # ensure longer path with spaces is properly abbreviated
+    a = tmpdir.join("d", "this is a test", "a", "still test")
+    # ensure longer path is properly abbreviated
+    b = tmpdir.join("d", "long_path_with_no_spaces", "more_long_path")
+    # ensure path not in need of abbreviation is properly roundtripped
+    c = tmpdir.join("d", "this", "is", "short")
+    # ensure paths that are the same in the first six letters
+    # are incremented post tilde
+    d = tmpdir.join("d", "longerpath1")
+    e = tmpdir.join("d", "longerpath2")
+    fs.mkdirp(a)
+    fs.mkdirp(b)
+    fs.mkdirp(c)
+    fs.mkdirp(d)
+    fs.mkdirp(e)
+    # check only for path of path we can control,
+    # pytest prefix may or may not be mangled by windows_sfn
+    # based on user/pytest config
+    assert "d\\THISIS~1\\a\\STILLT~1" in fs.windows_sfn(a)
+    assert "d\\LONG_P~1\\MORE_L~1" in fs.windows_sfn(b)
+    assert "d\\this\\is\\short" in fs.windows_sfn(c)
+    assert "d\\LONGER~1" in fs.windows_sfn(d)
+    assert "d\\LONGER~2" in fs.windows_sfn(e)
+    shutil.rmtree(tmpdir.join("d"))

lib/spack/spack/test/spec_semantics.py

@@ -1096,22 +1096,22 @@ def test_unsatisfiable_virtual_deps_bindings(self, spec_str):
 @pytest.mark.parametrize(
     "spec_str,format_str,expected",
     [
-        ("zlib@git.foo/bar", "{name}-{version}", str(pathlib.Path("zlib-git.foo_bar"))),
-        ("zlib@git.foo/bar", "{name}-{version}-{/hash}", None),
-        ("zlib@git.foo/bar", "{name}/{version}", str(pathlib.Path("zlib", "git.foo_bar"))),
+        ("git-test@git.foo/bar", "{name}-{version}", str(pathlib.Path("git-test-git.foo_bar"))),
+        ("git-test@git.foo/bar", "{name}-{version}-{/hash}", None),
+        ("git-test@git.foo/bar", "{name}/{version}", str(pathlib.Path("git-test", "git.foo_bar"))),
         (
-            "zlib@{0}=1.0%gcc".format("a" * 40),
+            "git-test@{0}=1.0%gcc".format("a" * 40),
             "{name}/{version}/{compiler}",
-            str(pathlib.Path("zlib", "{0}_1.0".format("a" * 40), "gcc")),
+            str(pathlib.Path("git-test", "{0}_1.0".format("a" * 40), "gcc")),
         ),
         (
-            "zlib@git.foo/bar=1.0%gcc",
+            "git-test@git.foo/bar=1.0%gcc",
             "{name}/{version}/{compiler}",
-            str(pathlib.Path("zlib", "git.foo_bar_1.0", "gcc")),
+            str(pathlib.Path("git-test", "git.foo_bar_1.0", "gcc")),
         ),
     ],
 )
-def test_spec_format_path(spec_str, format_str, expected):
+def test_spec_format_path(spec_str, format_str, expected, mock_git_test_package):
     _check_spec_format_path(spec_str, format_str, expected)
 
 
@@ -1129,45 +1129,57 @@ def _check_spec_format_path(spec_str, format_str, expected, path_ctor=None):
     "spec_str,format_str,expected",
     [
         (
-            "zlib@git.foo/bar",
+            "git-test@git.foo/bar",
             r"C:\\installroot\{name}\{version}",
-            r"C:\installroot\zlib\git.foo_bar",
+            r"C:\installroot\git-test\git.foo_bar",
         ),
         (
-            "zlib@git.foo/bar",
+            "git-test@git.foo/bar",
             r"\\hostname\sharename\{name}\{version}",
-            r"\\hostname\sharename\zlib\git.foo_bar",
+            r"\\hostname\sharename\git-test\git.foo_bar",
         ),
         # Windows doesn't attribute any significance to a leading
         # "/" so it is discarded
-        ("zlib@git.foo/bar", r"/installroot/{name}/{version}", r"installroot\zlib\git.foo_bar"),
+        (
+            "git-test@git.foo/bar",
+            r"/installroot/{name}/{version}",
+            r"installroot\git-test\git.foo_bar",
+        ),
     ],
 )
-def test_spec_format_path_windows(spec_str, format_str, expected):
+def test_spec_format_path_windows(spec_str, format_str, expected, mock_git_test_package):
     _check_spec_format_path(spec_str, format_str, expected, path_ctor=pathlib.PureWindowsPath)
 
 
 @pytest.mark.parametrize(
     "spec_str,format_str,expected",
     [
-        ("zlib@git.foo/bar", r"/installroot/{name}/{version}", "/installroot/zlib/git.foo_bar"),
-        ("zlib@git.foo/bar", r"//installroot/{name}/{version}", "//installroot/zlib/git.foo_bar"),
+        (
+            "git-test@git.foo/bar",
+            r"/installroot/{name}/{version}",
+            "/installroot/git-test/git.foo_bar",
+        ),
+        (
+            "git-test@git.foo/bar",
+            r"//installroot/{name}/{version}",
+            "//installroot/git-test/git.foo_bar",
+        ),
         # This is likely unintentional on Linux: Firstly, "\" is not a
         # path separator for POSIX, so this is treated as a single path
         # component (containing literal "\" characters); secondly,
         # Spec.format treats "\" as an escape character, so is
         # discarded (unless directly following another "\")
         (
-            "zlib@git.foo/bar",
+            "git-test@git.foo/bar",
             r"C:\\installroot\package-{name}-{version}",
-            r"C__installrootpackage-zlib-git.foo_bar",
+            r"C__installrootpackage-git-test-git.foo_bar",
         ),
         # "\" is not a POSIX separator, and Spec.format treats "\{" as a literal
         # "{", which means that the resulting format string is invalid
-        ("zlib@git.foo/bar", r"package\{name}\{version}", None),
+        ("git-test@git.foo/bar", r"package\{name}\{version}", None),
     ],
 )
-def test_spec_format_path_posix(spec_str, format_str, expected):
+def test_spec_format_path_posix(spec_str, format_str, expected, mock_git_test_package):
     _check_spec_format_path(spec_str, format_str, expected, path_ctor=pathlib.PurePosixPath)
 
 

lib/spack/spack/test/spec_syntax.py

@@ -551,12 +551,12 @@ def _specfile_for(spec_str, filename):
             "^[deptypes=build,link] zlib",
         ),
         (
-            "zlib@git.foo/bar",
+            "git-test@git.foo/bar",
             [
-                Token(TokenType.UNQUALIFIED_PACKAGE_NAME, "zlib"),
+                Token(TokenType.UNQUALIFIED_PACKAGE_NAME, "git-test"),
                 Token(TokenType.GIT_VERSION, "@git.foo/bar"),
             ],
-            "zlib@git.foo/bar",
+            "git-test@git.foo/bar",
         ),
         # Variant propagation
         (
@@ -585,7 +585,7 @@ def _specfile_for(spec_str, filename):
         ),
     ],
 )
-def test_parse_single_spec(spec_str, tokens, expected_roundtrip):
+def test_parse_single_spec(spec_str, tokens, expected_roundtrip, mock_git_test_package):
     parser = SpecParser(spec_str)
     assert tokens == parser.tokens()
     assert expected_roundtrip == str(parser.next_spec())

share/spack/gitlab/cloud_pipelines/configs/ci.yaml

@@ -29,7 +29,7 @@ ci:
       after_script:
       - - cat /proc/loadavg || true
         - cat /proc/meminfo | grep 'MemTotal\|MemFree' || true
-      - - time python ${CI_PROJECT_DIR}/share/spack/gitlab/cloud_pipelines/scripts/common/aggregate_package_logs.spack.py
+      - - time ./bin/spack python ${CI_PROJECT_DIR}/share/spack/gitlab/cloud_pipelines/scripts/common/aggregate_package_logs.spack.py
           --prefix /home/software/spack:${CI_PROJECT_DIR}/opt/spack
           --log install_times.json
           ${SPACK_ARTIFACTS_ROOT}/user_data/install_times.json || true

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

@@ -42,6 +42,7 @@ class Acts(CMakePackage, CudaPackage):
     # Supported Acts versions
     version("main", branch="main")
     version("master", branch="main", deprecated=True)  # For compatibility
+    version("34.0.0", commit="daafd83adf0ce50f9667f3c9d4791a459e39fd1b", submodules=True)
     version("33.1.0", commit="00591a593a648430820e980b031301d25c18f1c7", submodules=True)
     version("33.0.0", commit="f6ed9013e76120137ae456583a04b554d88d9452", submodules=True)
     version("32.1.0", commit="5333c67b49b4bfcd45558090e4ba37b4f86b82db", submodules=True)

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

@@ -23,6 +23,7 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage):
     license("BSD-3-Clause")
 
     version("master", branch="master")
+    version("1.6", sha256="c2230de185d62f1999d36c6b8b92825f19ab9fbf30bdae90595cab04e76561a4")
     version("1.5", sha256="c26f23c17e749ccf3e2d353a68969aa54d31b8e720dbfdbc2cef16c5d8477e9e")
     version("1.4.1", sha256="2ca828ef6615859654b233a7df17017e7cfd904982b80026ec7409eb46b77a95")
     version("1.4", sha256="803a1018a6305cf3fea161172b3ada49537f59261279d91c2abbcce9492ee7af")
@@ -65,6 +66,7 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("cmake@3.16:", type="build", when="@1.0:")
     depends_on("mpi", when="+mpi")
     depends_on("rocthrust", when="+rocm")
+    patch("0001-update-major-version-required-for-rocm-6.0.patch", when="@:1.5+rocm ^hip@6.0:")
 
     # Standalone Kokkos
     depends_on("kokkos@3.1.00:", when="~trilinos")
@@ -72,6 +74,7 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("kokkos@3.6.00:", when="@1.3~trilinos")
     depends_on("kokkos@3.7.01:", when="@1.4:~trilinos")
     depends_on("kokkos@4.0.00:", when="@1.5:~trilinos")
+    depends_on("kokkos@4.1.00:", when="@1.6:~trilinos")
     for backend in kokkos_backends:
         depends_on("kokkos+%s" % backend.lower(), when="~trilinos+%s" % backend.lower())
 
@@ -95,8 +98,9 @@ class Arborx(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("trilinos@13.2.0:", when="@1.2+trilinos")
     depends_on("trilinos@13.4.0:", when="@1.3+trilinos")
     depends_on("trilinos@14.0.0:", when="@1.4:+trilinos")
+    depends_on("trilinos@14.2.0:", when="@1.5:+trilinos")
+    depends_on("trilinos@14.4.0:", when="@1.6:+trilinos")
     patch("trilinos14.0-kokkos-major-version.patch", when="@1.4+trilinos ^trilinos@14.0.0")
-    patch("0001-update-major-version-required-for-rocm-6.0.patch", when="+rocm ^hip@6.0:")
     conflicts("~serial", when="+trilinos")
     conflicts("+cuda", when="+trilinos")
 
@@ -132,12 +136,6 @@ def cached_tests_work_dir(self):
 
     def test_run_ctest(self):
         """run ctest tests on the installed package"""
-
-        arborx_dir = self.spec["arborx"].prefix
-        cmake_prefix_path = f"-DCMAKE_PREFIX_PATH={arborx_dir}"
-        if "+mpi" in self.spec:
-            cmake_prefix_path += f";{self.spec['mpi'].prefix}"
-
         cmake_args = [
             ".",
             cmake_prefix_path,
@@ -150,7 +148,10 @@ def test_run_ctest(self):
                     else self.spec["trilinos"].prefix
                 ),
             ),
+            self.define("ArborX_ROOT", self.spec["arborx".prefix]),
         ]
+        if "+mpi" in self.spec:
+            cmake_args.append(self.define("MPI_HOME", self.spec["mpi"].prefix))
         cmake = which(self.spec["cmake"].prefix.bin.cmake)
         make = which("make")
         ctest = which("ctest")

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

@@ -23,10 +23,10 @@ class Brahma(CMakePackage):
 
     variant("mpi", default=False, description="Enable MPI support")
     depends_on("cpp-logger@0.0.1", when="@:0.0.1")
-    depends_on("cpp-logger@0.0.2", when="@0.0.2:")
+    depends_on("cpp-logger@0.0.2:", when="@0.0.2:")
     depends_on("gotcha@1.0.4", when="@:0.0.1")
-    depends_on("gotcha@1.0.5", when="@0.0.2:")
-    depends_on("catch2@3.0.1")
+    depends_on("gotcha@1.0.5:", when="@0.0.2:")
+    depends_on("catch2@3.0.1:")
 
     depends_on("mpi", when="+mpi")
 

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

@@ -112,7 +112,7 @@ class Charliecloud(AutotoolsPackage):
     depends_on("libtool", type="build")
 
     # pkg-config is required for 0.36 regardless of variant.
-    depends_on("pkg-config", type="build", when="@0.36")
+    depends_on("pkgconfig", type="build", when="@0.36")
 
     # Image manipulation.
     depends_on("python@3.6:", type="run")
@@ -146,7 +146,7 @@ class Charliecloud(AutotoolsPackage):
     # approach with squashfuse could implemented in a different variant.
     with when("+squashfuse"):
         depends_on("libfuse@3:", type=("build", "run", "link"), when="@0.32:")
-        depends_on("pkg-config", type="build", when="@0.37:")
+        depends_on("pkgconfig", type="build", when="@0.37:")
         depends_on("squashfuse@0.1.105:0.2.0,0.4.0:", type="build", when="@0.36:")
         depends_on("squashfuse@0.1.105:0.2.0,0.4.0", type="build", when="@0.35")
         depends_on("squashfuse@0.1.105", type="build", when="@0.32:0.34")

var/spack/repos/builtin/packages/charmpp/ofi-crayshasta-arm.patch

@@ -0,0 +1,13 @@
+diff --git a/src/arch/ofi-crayshasta/conv-mach.h b/src/arch/ofi-crayshasta/conv-mach.h
+index 61d295df3..9e15fd2a9 100644
+--- a/src/arch/ofi-crayshasta/conv-mach.h
++++ b/src/arch/ofi-crayshasta/conv-mach.h
+@@ -74,7 +74,7 @@
+ #define CMK_LBDB_ON					   1
+ 
+ #define CMK_64BIT                      1
+-#define CMK_AMD64                      1
++#define CMK_ARM                        1
+ 
+ /* Other possible definitions:
+ 

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

@@ -58,6 +58,9 @@ class Charmpp(Package):
     # Ignore compiler warnings while configuring
     patch("strictpass.patch", when="@:6.8.2")
 
+    # Support Cray Shasta with ARM
+    patch("ofi-crayshasta-arm.patch", when="backend=ofi pmi=cray-pmi target=aarch64:")
+
     # Build targets
     # "target" is reserved, so we have to use something else.
     variant(
@@ -86,7 +89,7 @@ class Charmpp(Package):
     variant(
         "pmi",
         default="none",
-        values=("none", "simplepmi", "slurmpmi", "slurmpmi2", "pmix"),
+        values=("none", "simplepmi", "slurmpmi", "slurmpmi2", "pmix", "cray-pmi"),
         description="The ucx/ofi/gni backends need PMI to run!",
     )
 
@@ -112,6 +115,7 @@ class Charmpp(Package):
     depends_on("cuda", when="+cuda")
 
     depends_on("ucx", when="backend=ucx")
+    depends_on("libfabric", when="backend=ofi")
     depends_on("slurm@:17-11-9-2", when="pmi=slurmpmi")
     depends_on("slurm@17-11-9-2:", when="pmi=slurmpmi2")
 
@@ -123,6 +127,7 @@ class Charmpp(Package):
     depends_on("mpi", when="pmi=simplepmi")
     depends_on("mpi", when="pmi=slurmpmi")
     depends_on("mpi", when="pmi=slurmpmi2")
+    depends_on("cray-mpich", when="pmi=cray-pmi")
 
     # Git versions of Charm++ require automake and autoconf
     depends_on("automake", when="@develop")
@@ -180,7 +185,6 @@ def charmarch(self):
             ("linux", "x86_64", "netlrts"): "netlrts-linux-x86_64",
             ("linux", "x86_64", "verbs"): "verbs-linux-x86_64",
             ("linux", "x86_64", "ofi"): "ofi-linux-x86_64",
-            ("linux", "x86_64", "ucx"): "ucx-linux-x86_64",
             ("linux", "ppc", "mpi"): "mpi-linux-ppc",
             ("linux", "ppc", "multicore"): "multicore-linux-ppc",
             ("linux", "ppc", "netlrts"): "netlrts-linux-ppc",
@@ -195,29 +199,53 @@ def charmarch(self):
             ("cnl", "x86_64", "mpi"): "mpi-crayxc",
         }
 
-        # Some versions were renamed/removed in 6.11
-        if self.spec.version < Version("6.11.0"):
-            versions.update({("linux", "i386", "mpi"): "mpi-linux"})
-            versions.update({("linux", "i386", "multicore"): "multicore-linux"})
-            versions.update({("linux", "i386", "netlrts"): "netlrts-linux"})
-            versions.update({("linux", "i386", "uth"): "uth-linux"})
+        if self.spec.satisfies("@6.10:"):
             versions.update(
                 {
+                    ("linux", "x86_64", "ucx"): "ucx-linux-x86_64",
+                    ("linux", "aarch64", "ucx"): "ucx-linux-arm8",
+                }
+            )
+
+        # Some versions were renamed/removed in 6.11
+        if self.spec.version < Version("6.11.0"):
+            versions.update(
+                {
+                    ("linux", "i386", "mpi"): "mpi-linux",
+                    ("linux", "i386", "multicore"): "multicore-linux",
+                    ("linux", "i386", "netlrts"): "netlrts-linux",
+                    ("linux", "i386", "uth"): "uth-linux",
                     ("linux", "arm", "multicore"): "multicore-arm7",
                     ("linux", "aarch64", "multicore"): "multicore-arm8",
                 }
             )
         else:
-            versions.update({("linux", "i386", "mpi"): "mpi-linux-i386"})
-            versions.update({("linux", "i386", "multicore"): "multicore-linux-i386"})
-            versions.update({("linux", "i386", "netlrts"): "netlrts-linux-i386"})
             versions.update(
                 {
+                    ("linux", "i386", "mpi"): "mpi-linux-i386",
+                    ("linux", "i386", "multicore"): "multicore-linux-i386",
+                    ("linux", "i386", "netlrts"): "netlrts-linux-i386",
                     ("linux", "arm", "multicore"): "multicore-linux-arm7",
                     ("linux", "aarch64", "multicore"): "multicore-linux-arm8",
                 }
             )
 
+        if self.spec.satisfies("@7:"):
+            versions.update(
+                {
+                    ("linux", "arm", "mpi"): "mpi-linux-arm7",
+                    ("linux", "aarch64", "mpi"): "mpi-linux-arm8",
+                }
+            )
+
+            if self.spec.satisfies("backend=ofi pmi=cray-pmi"):
+                versions.update(
+                    {
+                        ("linux", "x86_64", "ofi"): "ofi-crayshasta",
+                        ("linux", "aarch64", "ofi"): "ofi-crayshasta",
+                    }
+                )
+
         if (plat, mach, comm) not in versions:
             raise InstallError(
                 "The communication mechanism %s is not supported "
@@ -394,4 +422,4 @@ def setup_dependent_package(self, module, dependent_spec):
         self.spec.mpicxx = self.prefix.bin.ampicxx
         self.spec.mpifc = self.prefix.bin.ampif90
         self.spec.mpif77 = self.prefix.bin.ampif77
-        self.spec.charmarch = self.charmarch
+        self.spec.charmarch = self.charmarch + "-smp" if self.spec.satisfies("+smp") else ""

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

@@ -17,7 +17,8 @@ class Cpuinfo(CMakePackage):
     license("BSD-2-Clause")
 
     version("main", branch="main")
-    version("2022-08-19", commit="8ec7bd91ad0470e61cf38f618cc1f270dede599c")  # py-torch@1.13
+    version("2023-01-13", commit="6481e8bef08f606ddd627e4d3be89f64d62e1b8a")  # py-torch@2.1:
+    version("2022-08-19", commit="8ec7bd91ad0470e61cf38f618cc1f270dede599c")  # py-torch@1.13:2.0
     version("2020-12-17", commit="5916273f79a21551890fd3d56fc5375a78d1598d")  # py-torch@1.8:1.12
     version("2020-06-11", commit="63b254577ed77a8004a9be6ac707f3dccc4e1fd9")  # py-torch@1.6:1.7
     version("2020-01-21", commit="0e6bde92b343c5fbcfe34ecd41abf9515d54b4a7")  # py-torch@1.5
@@ -30,9 +31,12 @@ class Cpuinfo(CMakePackage):
     depends_on("cmake@3.5:", type="build")
 
     def cmake_args(self):
+        # https://salsa.debian.org/deeplearning-team/cpuinfo/-/blob/master/debian/rules
         return [
-            self.define("BUILD_SHARED_LIBS", True),
             self.define("CPUINFO_BUILD_UNIT_TESTS", False),
             self.define("CPUINFO_BUILD_MOCK_TESTS", False),
             self.define("CPUINFO_BUILD_BENCHMARKS", False),
+            self.define("CPUINFO_LIBRARY_TYPE", "shared"),
+            self.define("CPUINFO_LOG_LEVEL", "error"),
+            self.define("CMAKE_SKIP_RPATH", True),
         ]

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

@@ -34,6 +34,7 @@ class Crtm(CMakePackage):
     depends_on("netcdf-fortran", when="@v2.3-jedi.4")
     depends_on("netcdf-fortran", when="@v2.4-jedi.1")
     depends_on("netcdf-fortran", when="@v2.4-jedi.2")
+    depends_on("netcdf-fortran", when="@v2.4.1-jedi")
 
     depends_on("crtm-fix@2.3.0_emc", when="@2.3.0 +fix")
     depends_on("crtm-fix@2.4.0_emc", when="@2.4.0 +fix")
@@ -41,6 +42,7 @@ class Crtm(CMakePackage):
     depends_on("ecbuild", type=("build"), when="@v2.3-jedi.4")
     depends_on("ecbuild", type=("build"), when="@v2.4-jedi.1")
     depends_on("ecbuild", type=("build"), when="@v2.4-jedi.2")
+    depends_on("ecbuild", type=("build"), when="@v2.4.1-jedi")
 
     # ecbuild release v2.4.0 is broken
     # add ecbuild dependency for next release with fix
@@ -48,6 +50,10 @@ class Crtm(CMakePackage):
 
     license("CC0-1.0")
 
+    version(
+        "v2.4.1-jedi", sha256="fd8bf4db4f2a3b420b4186de84483ba2a36660519dffcb1e0ff14bfe8c6f6a14"
+    )
+    version("2.4.0.1", tag="v2.4.0_emc.3", commit="7ecad4866c400d7d0db1413348ee225cfa99ff36")
     # REL-2.4.0_emc (v2.4.0 ecbuild does not work)
     version("2.4.0", commit="5ddd0d6b0138284764065feda73b5adf599082a2")
     # Uses the tip of REL-2.3.0_emc branch
@@ -58,3 +64,17 @@ class Crtm(CMakePackage):
     # Branch release/crtm_jedi_v2.4.0
     version("v2.4-jedi.1", commit="82223419fdb479d76c2f2109c2b704e1d9618f22")
     version("v2.4-jedi.2", commit="62831cbb6c1ffcbb219eeec60e1b1c422526f597")
+
+    def url_for_version(self, version):
+        if self.spec.satisfies("@v3") or version >= Version("3.0.0"):
+            return "https://github.com/JCSDA/crtmv3/archive/refs/tags/{}.tar.gz".format(version)
+        else:
+            return "https://github.com/JCSDA/crtm/archive/refs/tags/{}.tar.gz".format(version)
+
+    @when("@2.4.0.1")
+    def patch(self):
+        if self.compiler.name in ["gcc", "clang", "apple-clang"]:
+            # Line lengths in RSS_Emissivity_Model.f90 are too long for gfortran default limit
+            filter_file(
+                "-fbacktrace", "-fbacktrace -ffree-line-length-none", "libsrc/CMakeLists.txt"
+            )

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

@@ -32,6 +32,7 @@ class Curl(NMakePackage, AutotoolsPackage):
 
     license("curl")
 
+    version("8.7.1", sha256="05bbd2b698e9cfbab477c33aa5e99b4975501835a41b7ca6ca71de03d8849e76")
     version("8.6.0", sha256="b4785f2d8877fa92c0e45d7155cf8cc6750dbda961f4b1a45bcbec990cf2fa9b")
     version("8.4.0", sha256="e5250581a9c032b1b6ed3cf2f9c114c811fc41881069e9892d115cc73f9e88c6")
 

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

@@ -18,6 +18,7 @@ class Damaris(CMakePackage):
     license("LGPL-3.0-or-later")
 
     version("master", branch="master")
+    version("1.10.0", tag="v1.10.0", commit="4e6b2641be1f7ded379312a8e7f4644ebe009ec9")
     version("1.9.2", tag="v1.9.2", commit="22c146b4b4ca047d4d36fd904d248e0280b3c0ea")
     version("1.9.1", tag="v1.9.1", commit="2fe83f587837b7ad0b5c187b8ff453f7d3ad2c18")
     version("1.9.0", tag="v1.9.0", commit="23cac3a8ade9f9c20499081a8ed10b3e51801428")

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

@@ -22,6 +22,7 @@ class FluxCore(AutotoolsPackage):
     license("LGPL-3.0-only")
 
     version("master", branch="master")
+    version("0.61.2", sha256="06f38143723e3f8331f55893ad8f74d43eb0588078f91abb603690c3e5f5112c")
     version("0.61.1", sha256="59cc730b34b732a1d00355bb5589bf2d26bf522b4a31ebfabff70ddb3afb51d6")
     version("0.61.0", sha256="02cedc6abb12816cbb01f2195c1acf7b6552c1d8b9029f899148df48a7cd05e2")
     version("0.60.0", sha256="f96025204a20f94c2821db47fe010b2c19e076ef93281ac7d308e82853e135ff")

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

@@ -491,6 +491,7 @@ def setup_run_environment(self, env):
     def patch(self):
         if "+java platform=darwin" in self.spec:
             filter_file("linux", "darwin", "swig/java/java.opt", string=True)
+            filter_file("-lazy-ljvm", "-ljvm", "configure", string=True)
 
 
 class CMakeBuilder(CMakeBuilder):

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

@@ -57,15 +57,12 @@ def cmake_args(self):
             self.define("BUILD_UTILS", True),
             self.define("GLEW_REGAL", False),
             self.define("GLEW_EGL", "gl=egl" in spec),
-            self.define("OpenGL_GL_PREFERENCE", "LEGACY"),
             self.define("OPENGL_INCLUDE_DIR", spec["gl"].headers.directories[0]),
             self.define("OPENGL_gl_LIBRARY", spec["gl"].libs[0]),
             self.define("OPENGL_opengl_LIBRARY", "IGNORE"),
             self.define("OPENGL_glx_LIBRARY", "IGNORE"),
             self.define("OPENGL_glu_LIBRARY", "IGNORE"),
             self.define("GLEW_OSMESA", "gl=osmesa" in spec),
-            self.define("GLEW_X11", "gl=glx" in spec),
-            self.define("CMAKE_DISABLE_FIND_PACKAGE_X11", "gl=glx" not in spec),
         ]
         if "gl=egl" in spec:
             args.append(

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

@@ -18,6 +18,7 @@ class Goma(CMakePackage):
 
     license("GPL-2.0-or-later")
 
+    version("7.6.1", commit="c799e935009b85e00979fa8b248952194f6ade7a")
     version("7.4.3", commit="bb0cf8030f9e8d61066d052ea6fad67fe49651f8")
     version("7.3.0", commit="415f442953e2171afae1f8ad55868052c6f511ce")
     version("7.2.0", commit="814f433aa5674c07274fffd4a619d80cd31f71ab")

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

@@ -44,10 +44,10 @@ class Googletest(CMakePackage):
     def cmake_args(self):
         spec = self.spec
         args = [
-            self.define_from_variant("gtest_disable_pthreads", "pthreads"),
             self.define_from_variant("BUILD_SHARED_LIBS", "shared"),
             self.define_from_variant("CMAKE_CXX_STANDARD", "cxxstd"),
         ]
+        args.append(self.define("gtest_disable_pthreads", not spec.satisfies("pthreads")))
         if spec.satisfies("@1.8:"):
             # New style (contains both Google Mock and Google Test)
             args.append(self.define("BUILD_GTEST", True))

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

@@ -225,15 +225,20 @@ class Gromacs(CMakePackage, CudaPackage):
     # Above dependencies can be verified, and new versions added, by going to
     # https://github.com/plumed/plumed2/tree/v2.9.0/patches
     # and switching tags.
+
+    # Versions without minor release number, such as `2023` and `2021`,
+    # require exact specifcation using `@=`, starting from Spack v0.20.0,
+    # see https://github.com/spack/spack/releases/tag/v0.20.0
+
     plumed_patches = {
-        "2023": "2.9.0",
+        "=2023": "2.9.0",
         "2022.5": "2.8.2:2.9.0",
         "2022.3": "2.8.1",
         "2021.7": "2.8.2:2.9.0",
         "2021.6": "2.8.1",
         "2021.5": "2.7.5:2.7.6",
         "2021.4": "2.7.3:2.8.0",
-        "2021": "2.7.1:2.7.2",
+        "=2021": "2.7.1:2.7.2",
         "2020.7": "2.8.1:2.9.0",
         "2020.6": "2.7.2:2.8.0",
         "2020.5": "2.7.1",

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

@@ -146,7 +146,11 @@ def flag_handler(self, name, flags):
 
         if name == "cflags":
             # https://forum.hdfgroup.org/t/help-building-hdf4-with-clang-error-implicit-declaration-of-function-test-mgr-szip-is-invalid-in-c99/7680
-            if self.spec.satisfies("@:4.2.15 %apple-clang") or self.spec.satisfies("%clang@16:"):
+            if (
+                self.spec.satisfies("@:4.2.15 %apple-clang")
+                or self.spec.satisfies("%clang@16:")
+                or self.spec.satisfies("%oneapi")
+            ):
                 flags.append("-Wno-error=implicit-function-declaration")
 
             if self.spec.satisfies("%clang@16:"):

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

@@ -112,7 +112,10 @@ class Hdf5(CMakePackage):
     depends_on("cmake@3.12:", type="build")
     depends_on("cmake@3.18:", type="build", when="@1.13:")
 
-    depends_on("mpi", when="+mpi")
+    with when("+mpi"):
+        depends_on("mpi")
+        depends_on("mpich+fortran", when="+fortran ^[virtuals=mpi] mpich")
+
     depends_on("java", type=("build", "run"), when="+java")
     depends_on("szip", when="+szip")
     depends_on("zlib-api")

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

@@ -56,8 +56,6 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
 
     depends_on("cmake@3.10.2:", type="build")
 
-    depends_on("hip +cuda", when="+cuda")
-
     depends_on("googletest@1.10.0:", type="test")
 
     for ver in [
@@ -81,6 +79,7 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
     ]:
         depends_on(f"rocprim@{ver}", when=f"+rocm @{ver}")
         depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
+        depends_on(f"hip +cuda@{ver}", when=f"+cuda @{ver}")
 
     # fix hardcoded search in /opt/rocm and broken config mode search
     patch("find-hip-cuda-rocm-5.1.patch", when="@5.1:5.2 +cuda")

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

@@ -143,7 +143,7 @@ class Hpctoolkit(AutotoolsPackage, MesonPackage):
             depends_on("libtool", type="build")
 
         with when("@2024.02:"):
-            depends_on("pkgconf", type="build")
+            depends_on("pkgconfig", type="build")
             depends_on("cmake", type="build")
 
     boost_libs = (

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

@@ -26,6 +26,12 @@ class IntelOneapiDnn(IntelOneApiLibraryPackage):
         "https://software.intel.com/content/www/us/en/develop/tools/oneapi/components/onednn.html"
     )
 
+    version(
+        "2024.1.1",
+        url="https://registrationcenter-download.intel.com/akdlm//IRC_NAS/5f6d82fa-2580-4bb1-83bb-cce7a52d1d34/l_onednn_p_2024.1.1.16_offline.sh",
+        sha256="a67a387bc0d30a5ca1bd0ed3d551ed13df7dba7939b208fd0c81a24425e6e90a",
+        expand=False,
+    )
     version(
         "2024.1.0",
         url="https://registrationcenter-download.intel.com/akdlm/IRC_NAS/759e8b2a-cbff-4b4f-ad88-08deb7730e73/l_onednn_p_2024.1.0.571_offline.sh",

var/spack/repos/builtin/packages/iq-tree/package.py

@@ -16,6 +16,9 @@ class IqTree(CMakePackage):
 
     license("GPL-2.0-or-later")
 
+    version(
+        "2.3.1", tag="v2.3.1", commit="2914a2f7aac0a1a3c4fadde42c83e5dee315186d", submodules=True
+    )
     version(
         "2.2.2.7",
         tag="v2.2.2.7",

var/spack/repos/builtin/packages/jwt-cpp/package.py

@@ -16,6 +16,7 @@ class JwtCpp(CMakePackage):
 
     license("MIT")
 
+    version("0.7.0", sha256="b9eb270e3ba8221e4b2bc38723c9a1cb4fa6c241a42908b9a334daff31137406")
     version("0.6.0", sha256="0227bd6e0356b211341075c7997c837f0b388c01379bd256aa525566a5553f03")
     version("0.5.2", sha256="d3188f9611597eb1bb285169879e1d87202bf10a08e4e7734c9f2097bfd4a850")
     version("0.5.1", sha256="d8f5ffb361824630b3b6f4aad26c730c915081071040c232ac57947d6177ef4f")
@@ -37,6 +38,7 @@ class JwtCpp(CMakePackage):
     depends_on("openssl@1.0.2:", when="@0.5.0:0.5.99 ssl=openssl")
     depends_on("openssl@1.0.1:", when="@0.6.0: ssl=openssl")
     depends_on("libressl@3:", when="@0.5.0: ssl=libressl")
+    depends_on("nlohmann-json", when="@0.7.0:")
 
     def cmake_args(self):
         spec = self.spec

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

@@ -31,12 +31,24 @@ class Lammps(CMakePackage, CudaPackage, ROCmPackage, PythonExtension):
     #   marked deprecated=True
     # * patch releases older than a stable release should be marked deprecated=True
     version("develop", branch="develop")
-    version("20240207", sha256="d518f32de4eb2681f2543be63926411e72072dd7d67c1670c090b5baabed98ac")
+    version(
+        "20240207.1", sha256="3ba62c2a1ed463fceedf313a1c3ea2997994aa102379a8d35b525ea424f56776"
+    )
+    version(
+        "20240207",
+        sha256="d518f32de4eb2681f2543be63926411e72072dd7d67c1670c090b5baabed98ac",
+        deprecated=True,
+    )
     version("20231121", sha256="704d8a990874a425bcdfe0245faf13d712231ba23f014a3ebc27bc14398856f1")
+    version(
+        "20230802.3",
+        sha256="6666e28cb90d3ff01cbbda6c81bdb85cf436bbb41604a87f2ab2fa559caa8510",
+        preferred=True,
+    )
     version(
         "20230802.2",
         sha256="3bcecabc9cad08d0a4e4d989b52d29c58505f7ead8ebacf43c9db8d9fd3d564a",
-        preferred=True,
+        deprecated=True,
     )
     version(
         "20230802.1",
@@ -358,6 +370,7 @@ class Lammps(CMakePackage, CudaPackage, ROCmPackage, PythonExtension):
     )
 
     stable_versions = {
+        "20230802.3",
         "20230802.2",
         "20230802.1",
         "20230802",
@@ -862,6 +875,11 @@ def cmake_args(self):
 
         if "+rocm" in spec:
             args.append(self.define("CMAKE_CXX_COMPILER", spec["hip"].hipcc))
+            if "@:20231121" in spec:
+                if "^hip@:5.4" in spec:
+                    args.append(self.define("HIP_PATH", f"{spec['hip'].prefix}/hip"))
+                elif "^hip@5.5:" in spec:
+                    args.append(self.define("HIP_PATH", spec["hip"].prefix))
 
         return args
 

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

@@ -61,9 +61,9 @@ class Mpich(AutotoolsPackage, CudaPackage, ROCmPackage):
     variant("wrapperrpath", default=True, description="Enable wrapper rpath")
     variant(
         "pmi",
-        default="pmi",
+        default="default",
         description="""PMI interface.""",
-        values=("pmi", "pmi2", "pmix", "cray"),
+        values=("default", "pmi", "pmi2", "pmix", "cray"),
         multi=False,
     )
     variant(
@@ -388,10 +388,16 @@ def is_disabled(text):
             if re.search(r"--with-thread-package=argobots", output):
                 variants.append("+argobots")
 
-            if re.search(r"--with-pmi=simple", output):
+            if re.search(r"--with-pmi=default", output):
+                variants.append("pmi=default")
+            elif re.search(r"--with-pmi=simple", output):
                 variants.append("pmi=pmi")
             elif re.search(r"--with-pmi=pmi2/simple", output):
                 variants.append("pmi=pmi2")
+            elif re.search(r"--with-pmi=pmi", output):
+                variants.append("pmi=pmi")
+            elif re.search(r"--with-pmi=pmi2", output):
+                variants.append("pmi=pmi2")
             elif re.search(r"--with-pmix", output):
                 variants.append("pmi=pmix")
 
@@ -555,14 +561,32 @@ def configure_args(self):
         else:
             config_args.append("--with-slurm=no")
 
-        if "pmi=pmi" in spec:
-            config_args.append("--with-pmi=simple")
-        elif "pmi=pmi2" in spec:
-            config_args.append("--with-pmi=pmi2/simple")
-        elif "pmi=pmix" in spec:
-            config_args.append("--with-pmix={0}".format(spec["pmix"].prefix))
-        elif "pmi=cray" in spec:
-            config_args.append("--with-pmi=cray")
+        # PMI options changed in 4.2.0
+        if spec.satisfies("@4.2:"):
+            # default (no option) is to build both PMIv1 and PMI2 client interfaces
+            if "pmi=pmi" in spec:
+                # make PMI1 the default client interface
+                config_args.append("--with-pmi=pmi")
+            elif "pmi=pmi2" in spec:
+                # make PMI2 the default client interface
+                config_args.append("--with-pmi=pmi2")
+            elif "pmi=pmix" in spec:
+                # use the PMIx client interface with an external PMIx library
+                config_args.append("--with-pmi=pmix")
+                config_args.append(f"--with-pmix={spec['pmix'].prefix}")
+            elif "pmi=cray" in spec:
+                # use PMI2 interface of the Cray PMI library
+                config_args.append("--with-pmi=pmi2")
+                config_args.append(f"--with-pmi2={spec['cray-pmi'].prefix}")
+        else:
+            if "pmi=pmi" in spec:
+                config_args.append("--with-pmi=simple")
+            elif "pmi=pmi2" in spec:
+                config_args.append("--with-pmi=pmi2/simple")
+            elif "pmi=pmix" in spec:
+                config_args.append(f"--with-pmix={spec['pmix'].prefix}")
+            elif "pmi=cray" in spec:
+                config_args.append("--with-pmi=cray")
 
         if "+cuda" in spec:
             config_args.append("--with-cuda={0}".format(spec["cuda"].prefix))

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

@@ -30,6 +30,8 @@ class Octave(AutotoolsPackage, GNUMirrorPackage):
 
     license("GPL-3.0-or-later")
 
+    version("9.1.0", sha256="3f8c6c6ecfa249a47c97e18e651be4db8499be2f5de1a095a3eea53efc01d6a1")
+    version("8.4.0", sha256="6b38dd9751678424aeb3a9d666432b1f378eb3971a21290a90cd3d35119d56ad")
     version("8.2.0", sha256="57d17f918a940d38ca3348211e110b34d735a322a87db71c177c4692a49a9c84")
     version("8.1.0", sha256="8052074d17b0ef643d037de8ab389672c752bb201ee9cea4dfa69858fb6a213f")
     version("7.3.0", sha256="6e14a4649d70af45ab660f8cbbf645aaf1ec33f25f88bfda4697cb17e440c4f5")

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

@@ -0,0 +1,54 @@
+# 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 spack.build_systems.go
+from spack.package import *
+
+
+class Ollama(GoPackage):
+    """Run Llama 2, Code Llama, and other models. Customize and create your own."""
+
+    homepage = "https://ollama.com"
+    git = "https://github.com/ollama/ollama.git"
+
+    maintainers("teaguesterling")
+
+    # We're using commit IDs because the `go generate` process will fail for some
+    # dependencies that expect to be within a git repo. This is also an issue with
+    # cached downloads, but I don't know how to fix that yet
+    version("0.1.31", commit="dc011d16b9ff160c0be3829fc39a43054f0315d0", submodules=True)
+    # This is the last verified non-preview version as of 20240413
+    version(
+        "0.1.30",
+        commit="756c2575535641f1b96d94b4214941b90f4c30c7",
+        submodules=True,
+        preferred=True,
+    )
+
+    license("MIT", checked_by="teaguesterling")
+
+    depends_on("cmake", type="build")
+    depends_on("go", type="build")
+    depends_on("gcc", type="build")
+    depends_on("git", type="build")
+    depends_on("ccache", type="build")
+
+
+class GoBuilder(spack.build_systems.go.GoBuilder):
+    phases = ("generate", "build", "install")
+
+    @property
+    def generate_args(self):
+        """Arguments for ``go generate``."""
+        return ["./..."]
+
+    def generate(self, pkg, spec, prefix):
+        """Runs ``go generate`` in the source directory"""
+        import inspect
+
+        import llnl.util.filesystem as fs
+
+        with fs.working_dir(self.build_directory):
+            inspect.getmodule(pkg).go("generate", *self.generate_args)

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

@@ -20,6 +20,7 @@ class Onnx(CMakePackage):
     license("Apache-2.0")
 
     version("master", branch="master")
+    version("1.16.0", sha256="0ce153e26ce2c00afca01c331a447d86fbf21b166b640551fe04258b4acfc6a4")
     version("1.15.0", sha256="c757132e018dd0dd171499ef74fca88b74c5430a20781ec53da19eb7f937ef68")
     version("1.14.1", sha256="e296f8867951fa6e71417a18f2e550a730550f8829bd35e947b4df5e3e777aa1")
     version("1.14.0", sha256="1b02ad523f79d83f9678c749d5a3f63f0bcd0934550d5e0d7b895f9a29320003")

var/spack/repos/builtin/packages/openbabel/cmake-time.patch

@@ -0,0 +1,15 @@
+diff --git a/src/config.h.cmake b/src/config.h.cmake
+index 1c59c6769..26e5dde94 100644
+--- a/src/config.h.cmake
++++ b/src/config.h.cmake
+@@ -182,8 +182,8 @@
+ #define OB_MODULE_PATH "@OB_MODULE_PATH@"
+ 
+ #ifndef TIME_WITH_SYS_TIME
+-  #ifdef HAVE_SYS_TIME
+-    #ifdef HAVE_TIME
++  #ifdef HAVE_SYS_TIME_H
++    #ifdef HAVE_TIME_H
+       #define TIME_WITH_SYS_TIME 1
+     #else
+       #define TIME_WITH_SYS_TIME 0

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

@@ -58,6 +58,9 @@ class Openbabel(CMakePackage):
     # Convert tabs to spaces. Allows unit tests to pass
     patch("testpdbformat-tabs-to-spaces.patch", when="@:2.4.1")
 
+    # https://github.com/openbabel/openbabel/pull/2493
+    patch("cmake-time.patch", when="@3.1.1")
+
     def cmake_args(self):
         spec = self.spec
         args = []

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

@@ -163,7 +163,7 @@ class Podio(CMakePackage):
     patch("python-tests.patch", when="@:0.14.0")
 
     depends_on("root@6.08.06: cxxstd=17", when="cxxstd=17")
-    depends_on("root@6.28.04:", when="+rntuple")
+    depends_on("root@6.28.04: +root7", when="+rntuple")
     depends_on("root@6.28:", when="@0.17:")
     for cxxstd in ("17", "20"):
         depends_on("root cxxstd={}".format(cxxstd), when="cxxstd={}".format(cxxstd))

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

@@ -16,21 +16,9 @@ class PyAboutTime(PythonPackage):
 
     license("MIT")
 
-    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",
-    )
+    version("4.2.1", sha256="6a538862d33ce67d997429d14998310e1dbfda6cb7d9bbfbf799c4709847fece")
+    version("4.1.0", sha256="963b1f3739b0c9732eb205031762b76f1291d89b5d0c8220a8d5b154e32ce650")
+    version("3.1.1", sha256="586b329450c9387d1ae8c42d2db4f5b4c57a54508d0f1b7bb00322ffd5ce9f9b")
 
-    with default_args(type=("build", "run")):
-        depends_on("python@3.7:3", when="@4:")
+    depends_on("python@3.7:3", type=("build", "run"), when="@4:")
+    depends_on("py-setuptools", type="build")

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

@@ -16,23 +16,14 @@ class PyAccelerate(PythonPackage):
 
     license("Apache-2.0")
 
-    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",
-    )
+    version("0.21.0", sha256="e2959a0bf74d97c0b3c0e036ed96065142a060242281d27970d4c4e34f11ca59")
+    version("0.16.0", sha256="d13e30f3e6debfb46cada7b931af85560619b6a6a839d0cafeeab6ed7c6a498d")
 
-    with default_args(type=("build", "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")
+    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"))

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

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

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

@@ -19,14 +19,10 @@ class PyAdal(PythonPackage):
 
     license("MIT")
 
-    version(
-        "1.2.4",
-        sha256="b332316f54d947f39acd9628e7d61d90f6e54d413d6f97025a51482c96bac6bc",
-        url="https://pypi.org/packages/46/58/a19e0eb0c388fb7aced40f940c09069343862613d83095b592a8d3961ba1/adal-1.2.4-py2.py3-none-any.whl",
-    )
+    version("1.2.4", sha256="7a15d22b1ee7ce1be92441199958748982feba6b7dec35fbf60f9b607bad1bc0")
 
-    with default_args(type=("build", "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")
+    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"))

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

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

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

@@ -13,13 +13,7 @@ class PyAenum(PythonPackage):
     homepage = "https://github.com/ethanfurman/aenum"
     pypi = "aenum/aenum-2.1.2.tar.gz"
 
-    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",
-    )
+    version("3.1.12", sha256="3e531c91860a81f885f7e6e97d219ae9772cb899580084788935dad7d9742ef0")
+    version("2.1.2", sha256="a3208e4b28db3a7b232ff69b934aef2ea1bf27286d9978e1e597d46f490e4687")
+
+    depends_on("py-setuptools", type="build")

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

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

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

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

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

@@ -15,16 +15,11 @@ class PyAiofiles(PythonPackage):
 
     license("Apache-2.0")
 
-    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",
-    )
+    version("0.7.0", sha256="a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4")
+    version("0.5.0", sha256="98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af")
 
-    with default_args(type=("build", "run")):
-        depends_on("python@:3", when="@0.7:0")
+    depends_on("python@3.6:3", when="@0.7:", type=("build", "run"))
+    depends_on("py-poetry-core@1:", when="@0.7:", type="build")
+
+    # Historical dependencies
+    depends_on("py-setuptools", when="@:0.6", type="build")

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

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

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

@@ -16,17 +16,10 @@ class PyAioitertools(PythonPackage):
 
     license("MIT")
 
-    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",
-    )
+    version("0.11.0", sha256="42c68b8dd3a69c2bf7f2233bf7df4bb58b557bca5252ac02ed5187bbc67d6831")
+    version("0.7.1", sha256="54a56c7cf3b5290d1cb5e8974353c9f52c677612b5d69a859369a020c53414a3")
 
-    with default_args(type=("build", "run")):
-        depends_on("py-typing-extensions@4:", when="@0.9: ^python@:3.9")
-        depends_on("py-typing-extensions@3.7:", when="@0.7")
+    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"))

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

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

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

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

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

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

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

@@ -14,23 +14,9 @@ class PyAlabaster(PythonPackage):
     pypi = "alabaster/alabaster-0.7.10.tar.gz"
     git = "https://github.com/sphinx-doc/alabaster.git"
 
-    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",
-    )
+    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")

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

@@ -18,17 +18,13 @@ class PyAlpacaEval(PythonPackage):
 
     license("Apache-2.0")
 
-    version(
-        "0.2.8",
-        sha256="a83279fcccfb63b81a60a410b4165291a586b7efde8709ac5a1380917530ac4f",
-        url="https://pypi.org/packages/c9/35/f7d6eb3909fd36ecbf927186a2c23cd257c45dc95dd1314dc2169a7aa9d9/alpaca_eval-0.2.8-py3-none-any.whl",
-    )
+    version("0.2.8", sha256="5b21b74d7362ee229481b6a6d826dd620b2ef6b82e4f5470645e0a4b696a31e6")
 
-    with default_args(type=("build", "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:")
+    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"))

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

@@ -18,28 +18,24 @@ class PyAlpacaFarm(PythonPackage):
 
     license("Apache-2.0")
 
-    version(
-        "0.1.9",
-        sha256="24ba2fa007205a98f8c7208071e54edcf295a03bb2d19b71a1da27d27dafc537",
-        url="https://pypi.org/packages/15/40/c7098f4ebe1006e2b6843eebfd05f15431d5312dcc37efa785f4089a78d3/alpaca_farm-0.1.9-py3-none-any.whl",
-    )
+    version("0.1.9", sha256="1039d33c814d0bbbcab6a0e77ed8e897992ad7107d5c4999d56bdad7e0b0a59f")
 
-    with default_args(type=("build", "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")
+    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"))

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

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

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

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

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

@@ -14,13 +14,7 @@ class PyAniso8601(PythonPackage):
 
     license("BSD-3-Clause")
 
-    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",
-    )
+    version("9.0.1", sha256="72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973")
+    version("7.0.0", sha256="513d2b6637b7853806ae79ffaca6f3e8754bdd547048f5ccc1420aec4b714f1e")
+
+    depends_on("py-setuptools", type="build")

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

@@ -15,19 +15,16 @@ class PyAnndata(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version(
-        "0.8.0",
-        sha256="2a929360c3c893370865e8ee3d3b9d95ee93239da91bafc5bf5f3c306796746e",
-        url="https://pypi.org/packages/46/7f/ffe1546142d98ed55e7bb70eaedad92861d8e2ab07398ef7f06f4f46d06d/anndata-0.8.0-py3-none-any.whl",
-    )
+    version("0.8.0", sha256="94d2cc6f76c0317c0ac28564e3092b313b7ad19c737d66701961f3e620b9066e")
 
-    with default_args(type=("build", "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")
+    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"))

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

@@ -14,16 +14,9 @@ class PyAnnexremote(PythonPackage):
 
     license("GPL-3.0-only")
 
-    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",
-    )
+    version("1.6.0", sha256="779a43e5b1b4afd294761c6587dee8ac68f453a5a8cc40f419e9ca777573ae84")
+    version("1.5.0", sha256="92f32b6f5461cbaeefe0c60b32f9c1e0c1dbe4e57b8ee425affb56f4060f64ef")
 
-    with default_args(type=("build", "run")):
-        depends_on("py-future", when="@1.3:1.5")
+    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"))

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

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

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

@@ -16,16 +16,9 @@ class PyAnsimarkup(PythonPackage):
 
     license("BSD-3-Clause")
 
-    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",
-    )
+    version("2.1.0", sha256="7b3e3d93fecc5b64d23a6e8eb96dbc8b0b576a211829d948afb397d241a8c51b")
+    version("1.5.0", sha256="96c65d75bbed07d3dcbda8dbede8c2252c984f90d0ca07434b88a6bbf345fad3")
 
-    with default_args(type=("build", "run")):
-        depends_on("py-colorama", when="@1.4.1:")
+    depends_on("py-setuptools", type="build")
+    depends_on("py-setuptools@61:", type="build", when="@2.1.0")
+    depends_on("py-colorama", type=("build", "run"))

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

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

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

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

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

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

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

@@ -15,14 +15,10 @@ class PyApeye(PythonPackage):
 
     license("LGPL-3.0-or-later")
 
-    version(
-        "1.4.1",
-        sha256="44e58a9104ec189bf42e76b3a7fe91e2b2879d96d48e9a77e5e32ff699c9204e",
-        url="https://pypi.org/packages/89/7b/2d63664777b3e831ac1b1d8df5bbf0b7c8bee48e57115896080890527b1b/apeye-1.4.1-py3-none-any.whl",
-    )
+    version("1.4.1", sha256="14ea542fad689e3bfdbda2189a354a4908e90aee4bf84c15ab75d68453d76a36")
 
-    with default_args(type=("build", "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:")
+    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"))

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

@@ -13,13 +13,9 @@ class PyApipkg(PythonPackage):
 
     license("MIT")
 
-    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",
-    )
+    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"))

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

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

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

@@ -17,26 +17,10 @@ class PyArchspec(PythonPackage):
 
     license("Apache-2.0")
 
-    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",
-    )
+    version("0.2.3", sha256="d07deb5b6e2ab3b74861e217523d02e69be8522f6e6565f4cc5d2062eb1a5d2c")
+    version("0.2.2", sha256="d922c9fd80a5234d8cef883fbe0e146b381c449062c0405f91714ebad1edc035")
+    version("0.2.1", sha256="0974a8a95831d2d43cce906c5b79a35d5fd2bf9be478b0e3b7d83ccc51ac815e")
+    version("0.2.0", sha256="6aaba5ebdb5c3633c400d8c221a6a18716da0c64b367a8509f4217b22e91a5f5")
 
-    with default_args(type=("build", "run")):
-        depends_on("py-click@8.0.0:", when="@0.2:0.2.0")
+    depends_on("py-poetry-core@1.0.0:", type="build")
+    depends_on("py-click@8", type=("build", "run"), when="@:0.2.0")

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

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

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

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

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

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

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

@@ -16,17 +16,13 @@ class PyArviz(PythonPackage):
 
     license("Apache-2.0")
 
-    version(
-        "0.6.1",
-        sha256="fa613e6f796501f352462c747638d7e1d7ae3e3ed36e665e547def1b2524602c",
-        url="https://pypi.org/packages/ec/8b/83472d660e004a69b8e7b3c1dd12a607167774097138445d0dda1a3590dc/arviz-0.6.1-py3-none-any.whl",
-    )
+    version("0.6.1", sha256="435edf8db49c41a8fa198f959e7581063006c49a4efdef4755bb778db6fd4f72")
 
-    with default_args(type=("build", "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")
+    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"))

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

@@ -16,12 +16,11 @@ class PyAsdfStandard(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version(
-        "1.0.3",
-        sha256="1c628379c75f0663b6376a7e681d31b1b54391053e53447c9921fb04c26d41da",
-        url="https://pypi.org/packages/b1/3e/2873079563324cbc60a152be07a38c8595bcfe0cadda4db8a1a1c9b5b2a7/asdf_standard-1.0.3-py3-none-any.whl",
-    )
+    version("1.0.3", sha256="afd8ff9a70e7b17f6bcc64eb92a544867d5d4fe1f0076719142fdf62b96cfd44")
 
-    with default_args(type=("build", "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")
+    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")

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

@@ -16,13 +16,12 @@ class PyAsdfTransformSchemas(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version(
-        "0.3.0",
-        sha256="b0dbcae1bd15afea52d67209d8a75533c0ad3713e7e0eb55d968ff70393cc7fc",
-        url="https://pypi.org/packages/2a/f2/b184f660552be16a3bd00b5c70eeb3abff9d154ccfbb1c868482a9559de0/asdf_transform_schemas-0.3.0-py3-none-any.whl",
-    )
+    version("0.3.0", sha256="0cf2ff7b22ccb408fe58ddd9b2441a59ba73fe323e416d59b9e0a4728a7d2dd6")
 
-    with default_args(type=("build", "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")
+    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")

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

@@ -16,13 +16,12 @@ class PyAsdfUnitSchemas(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version(
-        "0.1.0",
-        sha256="0e104b53c23a9e15541cfa5d101613d2724a9124fc56301324512659afb470d5",
-        url="https://pypi.org/packages/3e/55/78e900affcb8306cb669e52ee2eac670badef4c8d5938e8dae824ef21932/asdf_unit_schemas-0.1.0-py3-none-any.whl",
-    )
+    version("0.1.0", sha256="42b78d67213efe4ffd4529fb0e58d9c7a0dab5cbf8839b230f1bc0a446bff999")
 
-    with default_args(type=("build", "run")):
-        depends_on("python@3.8:")
-        depends_on("py-asdf-standard@1.0.1:", when="@:0.1")
-        depends_on("py-importlib-resources@3:", when="@:0.1 ^python@:3.8")
+    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")

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

@@ -14,73 +14,20 @@ class PyAsgiref(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version(
-        "3.7.2",
-        sha256="89b2ef2247e3b562a16eef663bc0e2e703ec6468e2fa8a5cd61cd449786d4f6e",
-        url="https://pypi.org/packages/9b/80/b9051a4a07ad231558fcd8ffc89232711b4e618c15cb7a392a17384bbeef/asgiref-3.7.2-py3-none-any.whl",
-    )
-    version(
-        "3.5.2",
-        sha256="1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4",
-        url="https://pypi.org/packages/af/6d/ea3a5c3027c3f14b0321cd4f7e594c776ebe64e4b927432ca6917512a4f7/asgiref-3.5.2-py3-none-any.whl",
-    )
-    version(
-        "3.5.0",
-        sha256="88d59c13d634dcffe0510be048210188edd79aeccb6a6c9028cdad6f31d730a9",
-        url="https://pypi.org/packages/0b/9f/5f3b91391578312827561b669a0397d58535b4e82966c8f1667525c7d563/asgiref-3.5.0-py3-none-any.whl",
-    )
-    version(
-        "3.2.7",
-        sha256="9ca8b952a0a9afa61d30aa6d3d9b570bb3fd6bafcf7ec9e6bed43b936133db1c",
-        url="https://pypi.org/packages/68/00/25013f7310a56d17e1ab6fd885d5c1f216b7123b550d295c93f8e29d372a/asgiref-3.2.7-py2.py3-none-any.whl",
-    )
-    version(
-        "3.2.6",
-        sha256="9c65b42045910c159ad41fc33692a8a6e6e154d8d05244ea69a0cbc617edad31",
-        url="https://pypi.org/packages/e2/ea/37fac52810bfa225c867cd05766d80c12799f0a0d38a552dfe0ba7d02a90/asgiref-3.2.6-py2.py3-none-any.whl",
-    )
-    version(
-        "3.2.5",
-        sha256="3e4192eaec0758b99722f0b0666d5fbfaa713054d92e8de5b58ba84ec5ce696f",
-        url="https://pypi.org/packages/bc/a9/90e110710d44289d807b5604bcd18419ece1a6f88e9a2489d3de4718a20b/asgiref-3.2.5-py2.py3-none-any.whl",
-    )
-    version(
-        "3.2.4",
-        sha256="5e60ea919b37e5b9d8896d802c0dbbe41b16ea6719e5695a43496ef43e5b19ac",
-        url="https://pypi.org/packages/80/c6/03bd9a8568952c275e8b2ee4ab3ac744d5fff7a8d2b5bba5b93715ba742e/asgiref-3.2.4-py2.py3-none-any.whl",
-    )
-    version(
-        "3.2.3",
-        sha256="ea448f92fc35a0ef4b1508f53a04c4670255a3f33d22a81c8fc9c872036adbe5",
-        url="https://pypi.org/packages/a5/cb/5a235b605a9753ebcb2730c75e610fb51c8cab3f01230080a8229fa36adb/asgiref-3.2.3-py2.py3-none-any.whl",
-    )
-    version(
-        "3.2.2",
-        sha256="a4ce726e6ef49cca13642ff49588530ebabcc47c669c7a95af37ea5a74b9b823",
-        url="https://pypi.org/packages/d0/39/42344b1060cfb5542eecef3ce6dda3d2d5a89a660716ed5980635985f2a7/asgiref-3.2.2-py2.py3-none-any.whl",
-    )
-    version(
-        "3.2.1",
-        sha256="ceac3968866501249712f482ae807605246cfae8293a70de29417868ddef673c",
-        url="https://pypi.org/packages/4c/b9/9eb9762c9b43754d49e6b85625c1a5a45673a3083c742be00d8721839b01/asgiref-3.2.1-py2.py3-none-any.whl",
-    )
-    version(
-        "3.2.0",
-        sha256="abfe78df4bdefdbdc6902b1900c14e60b4cd7fea2ce218b5f12d998a46a9eb18",
-        url="https://pypi.org/packages/fb/58/27f90221f17bbda171d345f06009749004b60aea53a723443903bd99673d/asgiref-3.2.0-py2.py3-none-any.whl",
-    )
-    version(
-        "3.1.4",
-        sha256="b718a9d35e204a96e2456c2271b0ef12e36124c363b3a8fd1d626744f23192aa",
-        url="https://pypi.org/packages/ce/2e/dd4b5afc37d595fc44def4f365cc8ee080a4962a0eb1e05e79da65a8e074/asgiref-3.1.4-py2.py3-none-any.whl",
-    )
-    version(
-        "3.1.3",
-        sha256="34227987327d13bc4b19d338faa6fed8a25cea79cca2e9e50490d212f56470f8",
-        url="https://pypi.org/packages/c2/c4/db607d2dcdd1d88763528de1066dec9f36cca470c1d101de5cc35c90b0b9/asgiref-3.1.3-py2.py3-none-any.whl",
-    )
+    version("3.7.2", sha256="9e0ce3aa93a819ba5b45120216b23878cf6e8525eb3848653452b4192b92afed")
+    version("3.5.2", sha256="4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424")
+    version("3.5.0", sha256="2f8abc20f7248433085eda803936d98992f1343ddb022065779f37c5da0181d0")
+    version("3.2.7", sha256="8036f90603c54e93521e5777b2b9a39ba1bad05773fcf2d208f0299d1df58ce5")
+    version("3.2.6", sha256="63007b556233381c5f22ae4c7e4292c9f1b953dc8909ae8fd268f611dc23cbd0")
+    version("3.2.5", sha256="c8f49dd3b42edcc51d09dd2eea8a92b3cfc987ff7e6486be734b4d0cbfd5d315")
+    version("3.2.4", sha256="f07043512078c76bb28a62fd1e327876599062b5f0aea60ed1d9cabc42e95fe2")
+    version("3.2.3", sha256="7e06d934a7718bf3975acbf87780ba678957b87c7adc056f13b6215d610695a0")
+    version("3.2.2", sha256="f62b1c88ebf5fe95db202a372982970edcf375c1513d7e70717df0750f5c2b98")
+    version("3.2.1", sha256="57ed0d07634a23bebfa1b02a1aa05eba09c37aab3fc93893e4039e7bc2d96d9e")
+    version("3.2.0", sha256="cefcbd64acbfc9f38913566824ef070dd9a50e63f1b4cc5a7f1c44be809d7ff3")
+    version("3.1.4", sha256="865b7ccce5a6e815607b08d9059fe9c058cd75c77f896f5e0b74ff6c1ba81818")
+    version("3.1.3", sha256="566126b4cbf190c315121965253ecb2159499197ff4afd686e0921f4dd987999")
 
-    with default_args(type=("build", "run")):
-        depends_on("python@3.7:", when="@3.5:3.7")
-        depends_on("py-typing-extensions@4:", when="@3.7.1: ^python@:3.10")
-        depends_on("py-typing-extensions", when="@3.3.2:3.6 ^python@:3.7")
+    depends_on("py-setuptools", type="build")
+    depends_on("py-typing-extensions@4:", type=("build", "run"), when="@3.7: ^python@:3.10")
+    depends_on("py-typing-extensions", type=("build", "run"), when="@3.5 ^python@:3.7")

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

@@ -15,23 +15,9 @@ class PyAsn1crypto(PythonPackage):
 
     license("MIT")
 
-    version(
-        "1.5.1",
-        sha256="db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67",
-        url="https://pypi.org/packages/c9/7f/09065fd9e27da0eda08b4d6897f1c13535066174cc023af248fc2a8d5e5a/asn1crypto-1.5.1-py2.py3-none-any.whl",
-    )
-    version(
-        "1.4.0",
-        sha256="4bcdf33c861c7d40bdcd74d8e4dd7661aac320fcdf40b9a3f95b4ee12fde2fa8",
-        url="https://pypi.org/packages/b5/a8/56be92dcd4a5bf1998705a9b4028249fe7c9a035b955fe93b6a3e5b829f8/asn1crypto-1.4.0-py2.py3-none-any.whl",
-    )
-    version(
-        "0.24.0",
-        sha256="2f1adbb7546ed199e3c90ef23ec95c5cf3585bac7d11fb7eb562a3fe89c64e87",
-        url="https://pypi.org/packages/ea/cd/35485615f45f30a510576f1a56d1e0a7ad7bd8ab5ed7cdc600ef7cd06222/asn1crypto-0.24.0-py2.py3-none-any.whl",
-    )
-    version(
-        "0.22.0",
-        sha256="d232509fefcfcdb9a331f37e9c9dc20441019ad927c7d2176cf18ed5da0ba097",
-        url="https://pypi.org/packages/97/ba/7e8117d8efcee589f4d96dd2b2eb1d997f96d27d214cf2b7134ad8acf6ab/asn1crypto-0.22.0-py2.py3-none-any.whl",
-    )
+    version("1.5.1", sha256="13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c")
+    version("1.4.0", sha256="f4f6e119474e58e04a2b1af817eb585b4fd72bdd89b998624712b5c99be7641c")
+    version("0.24.0", sha256="9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49")
+    version("0.22.0", sha256="cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a")
+
+    depends_on("py-setuptools", type="build")

var/spack/repos/builtin/packages/py-aspy-yaml/package.py

@@ -14,11 +14,8 @@ class PyAspyYaml(PythonPackage):
 
     license("MIT")
 
-    version(
-        "1.3.0",
-        sha256="463372c043f70160a9ec950c3f1e4c3a82db5fca01d334b6bc89c7164d744bdc",
-        url="https://pypi.org/packages/99/ce/78be097b00817ccf02deaf481eb7a603eecee6fa216e82fa7848cd265449/aspy.yaml-1.3.0-py2.py3-none-any.whl",
-    )
+    version("1.3.0", sha256="e7c742382eff2caed61f87a39d13f99109088e5e93f04d76eb8d4b28aa143f45")
 
-    with default_args(type=("build", "run")):
-        depends_on("py-pyyaml", when="@0.2.2:")
+    depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
+    depends_on("py-setuptools", type="build")
+    depends_on("py-pyyaml", type=("build", "run"))

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

@@ -14,23 +14,10 @@ class PyAsserts(PythonPackage):
 
     license("MIT")
 
-    version(
-        "0.10.0",
-        sha256="d42de39290badeb1816f09bec2996912718e9b3a379a3415e6731bb0d2b271b2",
-        url="https://pypi.org/packages/e2/07/cbb15d287cd9424b55da504124aea3cf59fec6de870dad1f75b7c0f717aa/asserts-0.10.0-py2.py3-none-any.whl",
-    )
-    version(
-        "0.9.1",
-        sha256="a33eed1fbddc053a929011025d6e8589c9e1ba0e13de6ae26d1f76c4f807f8d4",
-        url="https://pypi.org/packages/00/bf/6b059c76d427ee802c9372467e344245aaedfef1024333dee76c8748c486/asserts-0.9.1-py2.py3-none-any.whl",
-    )
-    version(
-        "0.9.0",
-        sha256="aa0685b6652b15f6b42c2be260e0f315eb6a42cf5f08e4b37ab90fb6d429bfb9",
-        url="https://pypi.org/packages/6d/bd/9357ffd43a07dffe5bb980eb776ae4276ac5c02ae5c77ceae3dc369d3b09/asserts-0.9.0-py2.py3-none-any.whl",
-    )
-    version(
-        "0.8.6",
-        sha256="609078daa69b619a733e812acd4d6d1d559028bed711c8712942fe718d50db57",
-        url="https://pypi.org/packages/90/be/d2b1249330b07afcbbfdbe5387d44e8bdeb728fba80e6e0f2bae2c4c657d/asserts-0.8.6-py2.py3-none-any.whl",
-    )
+    version("0.10.0", sha256="3466cf32c36d97ee2802121438003693546f590be81095317d0d698066bb5df7")
+    version("0.9.1", sha256="a73ea6b2ddc77364a5f0e13197f00662485944a6dd31c1f7555ff2f99c0f7319")
+    version("0.9.0", sha256="e3b8b06309234f9a7c6e4679e0f3cc127cf18da95c30fbb524ff47d439e22b17")
+    version("0.8.6", sha256="8a477746dbc501ac0d1fe9e593a1faafa7d361ceca79d994d3b2ebeecc7fbf32")
+
+    depends_on("python@2.7:2.8,3.5:", type=("build", "run"))
+    depends_on("py-setuptools", type="build")

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

@@ -14,18 +14,18 @@ class PyAstor(PythonPackage):
 
     license("BSD-3-Clause")
 
-    version(
-        "0.8.1",
-        sha256="070a54e890cefb5b3739d19f30f5a5ec840ffc9c50ffa7d23cc9fc1a38ebbfc5",
-        url="https://pypi.org/packages/c3/88/97eef84f48fa04fbd6750e62dcceafba6c63c81b7ac1420856c8dcc0a3f9/astor-0.8.1-py2.py3-none-any.whl",
-    )
-    version(
-        "0.8.0",
-        sha256="0e41295809baf43ae8303350e031aff81ae52189b6f881f36d623fa8b2f1960e",
-        url="https://pypi.org/packages/d1/4f/950dfae467b384fc96bc6469de25d832534f6b4441033c39f914efd13418/astor-0.8.0-py2.py3-none-any.whl",
-    )
-    version(
-        "0.6",
-        sha256="5b5d375c4e3d2d0f52fcfe0128bc064d928f36fe622b52e4127a631803fbe2ab",
-        url="https://pypi.org/packages/69/32/e8a3285c0be9ce7ef42bfa302b995109036994713344b6baeed88bb12146/astor-0.6-py2.py3-none-any.whl",
+    version("0.8.1", sha256="6a6effda93f4e1ce9f618779b2dd1d9d84f1e32812c23a29b3fff6fd7f63fa5e")
+    version("0.8.0", sha256="37a6eed8b371f1228db08234ed7f6cfdc7817a3ed3824797e20cbb11dc2a7862")
+    version("0.6", sha256="175ec395cde36aa0178c5a3120d03954c65d1ef4bb19ec4aa30e9d7a7cc426c4")
+
+    depends_on("python@2.7:2.8,3.4:", type=("build", "run"))
+    depends_on("py-setuptools", type="build")
+
+    # Build fails with newer versions of setuptools
+    # https://github.com/berkerpeksag/astor/issues/162
+    # https://github.com/berkerpeksag/astor/pull/163
+    patch(
+        "https://github.com/berkerpeksag/astor/pull/163/commits/30059dac4eb832e58ab2109db84508b294ba366d.patch?full_index=1",
+        sha256="edc5eeddabe153b08e938f52edaeb2d880ee3128082967f310db0f98510fe6e0",
+        when="@0.8.0",
     )

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

@@ -14,13 +14,10 @@ class PyAstpretty(PythonPackage):
 
     license("MIT")
 
-    version(
-        "2.0.0",
-        sha256="7f27633ed885033da8b58666e7079ffff7e8e01869ec1aa66484cb5185ea3aa4",
-        url="https://pypi.org/packages/34/8e/93b94d3c6dc00446ddf33d0e82490fcc52b094a0fd59bf5433158da330e5/astpretty-2.0.0-py2.py3-none-any.whl",
-    )
+    version("2.0.0", sha256="e4724bfd753636ba4a84384702e9796e5356969f40af2596d846ce64addde086")
 
     variant("typed", default=False, description="Add support for typed comments")
 
-    with default_args(type=("build", "run")):
-        depends_on("py-typed-ast", when="@1.4:2+typed")
+    depends_on("python@3.6.1:", type=("build", "run"))
+    depends_on("py-setuptools", type=("build", "run"))
+    depends_on("py-typed-ast", type=("build", "run"), when="+typed")

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

@@ -14,27 +14,13 @@ class PyAsttokens(PythonPackage):
 
     license("Apache-2.0")
 
-    version(
-        "2.4.0",
-        sha256="cf8fc9e61a86461aa9fb161a14a0841a03c405fa829ac6b202670b3495d2ce69",
-        url="https://pypi.org/packages/4f/25/adda9979586d9606300415c89ad0e4c5b53d72b92d2747a3c634701a6a02/asttokens-2.4.0-py2.py3-none-any.whl",
-    )
-    version(
-        "2.2.1",
-        sha256="6b0ac9e93fb0335014d382b8fa9b3afa7df546984258005da0b9e7095b3deb1c",
-        url="https://pypi.org/packages/f3/e1/64679d9d0759db5b182222c81ff322c2fe2c31e156a59afd6e9208c960e5/asttokens-2.2.1-py2.py3-none-any.whl",
-    )
-    version(
-        "2.0.8",
-        sha256="e3305297c744ae53ffa032c45dc347286165e4ffce6875dc662b205db0623d86",
-        url="https://pypi.org/packages/2d/1b/fdbdf82b86e07ca90985740ac160a1dd4ab09cb81071ec12d71c701e1138/asttokens-2.0.8-py2.py3-none-any.whl",
-    )
-    version(
-        "2.0.5",
-        sha256="0844691e88552595a6f4a4281a9f7f79b8dd45ca4ccea82e5e05b4bbdb76705c",
-        url="https://pypi.org/packages/16/d5/b0ad240c22bba2f4591693b0ca43aae94fbd77fb1e2b107d54fff1462b6f/asttokens-2.0.5-py2.py3-none-any.whl",
-    )
+    version("2.4.0", sha256="2e0171b991b2c959acc6c49318049236844a5da1d65ba2672c4880c1c894834e")
+    version("2.2.1", sha256="4622110b2a6f30b77e1473affaa97e711bc2f07d3f10848420ff1898edbe94f3")
+    version("2.0.8", sha256="c61e16246ecfb2cde2958406b4c8ebc043c9e6d73aaa83c941673b35e5d3a76b")
+    version("2.0.5", sha256="9a54c114f02c7a9480d56550932546a3f1fe71d8a02f1bc7ccd0ee3ee35cf4d5")
 
-    with default_args(type=("build", "run")):
-        depends_on("py-six@1.12:", when="@2.3:")
-        depends_on("py-six", when="@:2.2")
+    depends_on("py-setuptools@44:", type="build")
+    depends_on("py-setuptools-scm+toml@3.4.3:", type="build")
+
+    depends_on("py-six@1.12:", when="@2.3:", type=("build", "run"))
+    depends_on("py-six", type=("build", "run"))

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

@@ -16,17 +16,9 @@ class PyAstunparse(PythonPackage):
 
     license("PSF-2.0")
 
-    version(
-        "1.6.3",
-        sha256="c2652417f2c8b5bb325c885ae329bdf3f86424075c4fd1a128674bc6fba4b8e8",
-        url="https://pypi.org/packages/2b/03/13dde6512ad7b4557eb792fbcf0c653af6076b81e5941d36ec61f7ce6028/astunparse-1.6.3-py2.py3-none-any.whl",
-    )
-    version(
-        "1.6.2",
-        sha256="271fb1f3d7a2e3c66eab41000298860f046253d22ec96e4f024cfaf266805a8e",
-        url="https://pypi.org/packages/2e/37/5dd0dd89b87bb5f0f32a7e775458412c52d78f230ab8d0c65df6aabc4479/astunparse-1.6.2-py2.py3-none-any.whl",
-    )
+    version("1.6.3", sha256="5ad93a8456f0d084c3456d059fd9a92cce667963232cbf763eac3bc5b7940872")
+    version("1.6.2", sha256="dab3e426715373fd76cd08bb1abe64b550f5aa494cf1e32384f26fd60961eb67")
 
-    with default_args(type=("build", "run")):
-        depends_on("py-six@1.6.1:", when="@1.5:")
-        depends_on("py-wheel@0.23:", when="@1.5:")
+    depends_on("py-setuptools", type="build")
+    depends_on("py-wheel@0.23.0:0", type=("build", "run"))
+    depends_on("py-six@1.6.1:1", type=("build", "run"))

var/spack/repos/builtin/packages/py-async-generator/package.py

@@ -13,8 +13,7 @@ class PyAsyncGenerator(PythonPackage):
 
     license("Apache-2.0")
 
-    version(
-        "1.10",
-        sha256="01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b",
-        url="https://pypi.org/packages/71/52/39d20e03abd0ac9159c162ec24b93fbcaa111e8400308f2465432495ca2b/async_generator-1.10-py3-none-any.whl",
-    )
+    version("1.10", sha256="6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144")
+
+    depends_on("py-setuptools", type="build")
+    depends_on("python@3.5:")

var/spack/repos/builtin/packages/py-async-timeout/package.py

@@ -15,33 +15,13 @@ class PyAsyncTimeout(PythonPackage):
 
     license("Apache-2.0")
 
-    version(
-        "4.0.3",
-        sha256="7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028",
-        url="https://pypi.org/packages/a7/fa/e01228c2938de91d47b307831c62ab9e4001e747789d0b05baf779a6488c/async_timeout-4.0.3-py3-none-any.whl",
-    )
-    version(
-        "4.0.2",
-        sha256="8ca1e4fcf50d07413d66d1a5e416e42cfdf5851c981d679a09851a6853383b3c",
-        url="https://pypi.org/packages/d6/c1/8991e7c5385b897b8c020cdaad718c5b087a6626d1d11a23e1ea87e325a7/async_timeout-4.0.2-py3-none-any.whl",
-    )
-    version(
-        "4.0.1",
-        sha256="a22c0b311af23337eb05fcf05a8b51c3ea53729d46fb5460af62bee033cec690",
-        url="https://pypi.org/packages/41/4a/2ca8802045b6df8dd25a0f8f7c216808e9e3bff2809efe4a36cc99d35cca/async_timeout-4.0.1-py3-none-any.whl",
-    )
-    version(
-        "4.0.0",
-        sha256="f3303dddf6cafa748a92747ab6c2ecf60e0aeca769aee4c151adfce243a05d9b",
-        url="https://pypi.org/packages/53/a9/cd484af830e5c525553da1a585ff4fe6f1d91a12f0131c736a3ef0d99cce/async_timeout-4.0.0-py3-none-any.whl",
-    )
-    version(
-        "3.0.1",
-        sha256="4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3",
-        url="https://pypi.org/packages/e1/1e/5a4441be21b0726c4464f3f23c8b19628372f606755a9d2e46c187e65ec4/async_timeout-3.0.1-py3-none-any.whl",
-    )
+    version("4.0.2", sha256="2163e1640ddb52b7a8c80d0a67a08587e5d245cc9c553a74a847056bc2976b15")
+    version("4.0.1", sha256="b930cb161a39042f9222f6efb7301399c87eeab394727ec5437924a36d6eef51")
+    version("4.0.0", sha256="7d87a4e8adba8ededb52e579ce6bc8276985888913620c935094c2276fd83382")
+    version("3.0.1", sha256="0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f")
 
-    with default_args(type=("build", "run")):
-        depends_on("python@3.7:", when="@4.0.3:")
-        depends_on("py-typing-extensions@3.6.5:", when="@4.0.2: ^python@:3.7")
-        depends_on("py-typing-extensions@3.6.5:", when="@4.0.0-alpha2:4.0.1")
+    depends_on("py-setuptools@45:", type="build")
+    depends_on("python@3.5.3:", type=("build", "run"), when="@3.0.1:")
+    depends_on("python@3.6:", type=("build", "run"), when="@4.0.1:")
+    depends_on("py-typing-extensions@3.6.5:", type=("build", "run"), when="@4.0.1")
+    depends_on("py-typing-extensions@3.6.5:", type=("build", "run"), when="@4.0.2: ^python@:3.7")

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

@@ -15,8 +15,7 @@ class PyAsynctest(PythonPackage):
 
     license("Apache-2.0")
 
-    version(
-        "0.13.0",
-        sha256="5da6118a7e6d6b54d83a8f7197769d046922a44d2a99c21382f0a6e4fadae676",
-        url="https://pypi.org/packages/e8/b6/8d17e169d577ca7678b11cd0d3ceebb0a6089a7f4a2de4b945fe4b1c86db/asynctest-0.13.0-py3-none-any.whl",
-    )
+    version("0.13.0", sha256="c27862842d15d83e6a34eb0b2866c323880eb3a75e4485b079ea11748fd77fac")
+
+    depends_on("python@3.5:", type=("build", "run"))
+    depends_on("py-setuptools@30.3:", type="build")

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

@@ -15,11 +15,8 @@ class PyAttmap(PythonPackage):
 
     license("BSD-2-Clause")
 
-    version(
-        "0.13.2",
-        sha256="9c76af312c3678927a03ebb8fd2fa3a9cab37f7ce34f1dc574ea890c778f2f26",
-        url="https://pypi.org/packages/2b/14/20b368acd5aacbd0f01004f7ac8b57ced1a961833795c053fd87774ce7e8/attmap-0.13.2-py3-none-any.whl",
-    )
+    version("0.13.2", sha256="fdffa45f8671c13428eb8c3a1702bfdd1123badb99f7af14d72ad53cc7e770de")
 
-    with default_args(type=("build", "run")):
-        depends_on("py-ubiquerg@0.2.1:", when="@0.13:")
+    depends_on("py-setuptools", type="build")
+
+    depends_on("py-ubiquerg@0.2.1:", type=("build", "run"))

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

@@ -15,72 +15,26 @@ class PyAttrs(PythonPackage):
 
     license("MIT")
 
-    version(
-        "23.1.0",
-        sha256="1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04",
-        url="https://pypi.org/packages/f0/eb/fcb708c7bf5056045e9e98f62b93bd7467eb718b0202e7698eb11d66416c/attrs-23.1.0-py3-none-any.whl",
-    )
-    version(
-        "22.2.0",
-        sha256="29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836",
-        url="https://pypi.org/packages/fb/6e/6f83bf616d2becdf333a1640f1d463fef3150e2e926b7010cb0f81c95e88/attrs-22.2.0-py3-none-any.whl",
-    )
-    version(
-        "22.1.0",
-        sha256="86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c",
-        url="https://pypi.org/packages/f2/bc/d817287d1aa01878af07c19505fafd1165cd6a119e9d0821ca1d1c20312d/attrs-22.1.0-py2.py3-none-any.whl",
-    )
-    version(
-        "21.4.0",
-        sha256="2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4",
-        url="https://pypi.org/packages/be/be/7abce643bfdf8ca01c48afa2ddf8308c2308b0c3b239a44e57d020afa0ef/attrs-21.4.0-py2.py3-none-any.whl",
-    )
-    version(
-        "21.2.0",
-        sha256="149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1",
-        url="https://pypi.org/packages/20/a9/ba6f1cd1a1517ff022b35acd6a7e4246371dfab08b8e42b829b6d07913cc/attrs-21.2.0-py2.py3-none-any.whl",
-    )
-    version(
-        "20.3.0",
-        sha256="31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6",
-        url="https://pypi.org/packages/c3/aa/cb45262569fcc047bf070b5de61813724d6726db83259222cd7b4c79821a/attrs-20.3.0-py2.py3-none-any.whl",
-    )
-    version(
-        "20.2.0",
-        sha256="fce7fc47dfc976152e82d53ff92fa0407700c21acd20886a13777a0d20e655dc",
-        url="https://pypi.org/packages/14/df/479736ae1ef59842f512548bacefad1abed705e400212acba43f9b0fa556/attrs-20.2.0-py2.py3-none-any.whl",
-    )
-    version(
-        "20.1.0",
-        sha256="2867b7b9f8326499ab5b0e2d12801fa5c98842d2cbd22b35112ae04bf85b4dff",
-        url="https://pypi.org/packages/d6/e1/3aa3b03e7643ffd6e499b203fd2a44f79893443e8b0b520d05d3e5c638d5/attrs-20.1.0-py2.py3-none-any.whl",
-    )
-    version(
-        "19.3.0",
-        sha256="08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c",
-        url="https://pypi.org/packages/a2/db/4313ab3be961f7a763066401fb77f7748373b6094076ae2bda2806988af6/attrs-19.3.0-py2.py3-none-any.whl",
-    )
-    version(
-        "19.2.0",
-        sha256="ec20e7a4825331c1b5ebf261d111e16fa9612c1f7a5e1f884f12bd53a664dfd2",
-        url="https://pypi.org/packages/6b/e8/2ecaf86b128a34e225807f03b22664302937ab826bd3b7eccab6754d29ea/attrs-19.2.0-py2.py3-none-any.whl",
-    )
-    version(
-        "19.1.0",
-        sha256="69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79",
-        url="https://pypi.org/packages/23/96/d828354fa2dbdf216eaa7b7de0db692f12c234f7ef888cc14980ef40d1d2/attrs-19.1.0-py2.py3-none-any.whl",
-    )
-    version(
-        "18.1.0",
-        sha256="4b90b09eeeb9b88c35bc642cbac057e45a5fd85367b985bd2809c62b7b939265",
-        url="https://pypi.org/packages/41/59/cedf87e91ed541be7957c501a92102f9cc6363c623a7666d69d51c78ac5b/attrs-18.1.0-py2.py3-none-any.whl",
-    )
-    version(
-        "16.3.0",
-        sha256="c59426b15b45e39a7bc408eb6ba7e7188d9532764f873cc691199ddd975c97ef",
-        url="https://pypi.org/packages/bb/6c/730710c765ab6d4493f460196ab003671d27b38568412a780fc67532b47c/attrs-16.3.0-py2.py3-none-any.whl",
-    )
+    version("23.1.0", sha256="6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015")
+    version("22.2.0", sha256="c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99")
+    version("22.1.0", sha256="29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6")
+    version("21.4.0", sha256="626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd")
+    version("21.2.0", sha256="ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb")
+    version("20.3.0", sha256="832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700")
+    version("20.2.0", sha256="26b54ddbbb9ee1d34d5d3668dd37d6cf74990ab23c828c2888dccdceee395594")
+    version("20.1.0", sha256="0ef97238856430dcf9228e07f316aefc17e8939fc8507e18c6501b761ef1a42a")
+    version("19.3.0", sha256="f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72")
+    version("19.2.0", sha256="f913492e1663d3c36f502e5e9ba6cd13cf19d7fab50aa13239e420fef95e1396")
+    version("19.1.0", sha256="f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399")
+    version("18.1.0", sha256="e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b")
+    version("16.3.0", sha256="80203177723e36f3bbe15aa8553da6e80d47bfe53647220ccaa9ad7a5e473ccc")
 
-    with default_args(type=("build", "run")):
-        depends_on("python@3.7:", when="@23:")
-        depends_on("py-importlib-metadata", when="@23: ^python@:3.7")
+    depends_on("py-hatchling", when="@23.1:", type="build")
+    depends_on("py-hatch-vcs", when="@23.1:", type="build")
+    depends_on("py-hatch-fancy-pypi-readme", when="@23.1:", type="build")
+
+    with when("@:22.2.0"):
+        depends_on("py-setuptools@40.6.0:", when="@19.1", type="build")
+        depends_on("py-setuptools", type="build")
+
+    depends_on("py-importlib-metadata", when="@23.1: ^python@3.7", type=("build", "run"))

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

@@ -16,12 +16,10 @@ class PyAuditwheel(PythonPackage):
 
     license("MIT")
 
-    version(
-        "5.1.2",
-        sha256="4d06aea3ab59a2b8aa733798ac221556a3f5c021fddc42e5de5bcef20201c031",
-        url="https://pypi.org/packages/5e/6d/252b892a851cc43edb523982178da19cf69efc45f5f3aea9752a61813beb/auditwheel-5.1.2-py3-none-any.whl",
-    )
+    version("5.1.2", sha256="3ee5830014931ea84af5cd065c637b6614efa03d9b88bd8fbfc924e7ed01d6ba")
 
-    with default_args(type=("build", "run")):
-        depends_on("py-importlib-metadata", when="@5 ^python@:3.7")
-        depends_on("py-pyelftools@0.24:", when="@3.1.1:3.1,3.3:")
+    depends_on("python@3.6:", type=("build", "run"))
+    depends_on("py-setuptools@45:", type="build")
+    depends_on("py-setuptools-scm@6.2:", type="build")
+    depends_on("py-pyelftools@0.24:", type=("build", "run"))
+    depends_on("py-importlib-metadata", when="^python@:3.7", type=("build", "run"))

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

@@ -16,12 +16,8 @@ class PyAutodocsumm(PythonPackage):
 
     license("Apache-2.0")
 
-    version(
-        "0.2.11",
-        sha256="f1d0a623bf1ad64d979a9e23fd360d1fb1b8f869beaf3197f711552cddc174e2",
-        url="https://pypi.org/packages/c6/37/0a08e3e1d8b78185837c0c483267b87660ae74cdee0c91dc56ae83093965/autodocsumm-0.2.11-py3-none-any.whl",
-    )
+    version("0.2.11", sha256="183212bd9e9f3b58a96bb21b7958ee4e06224107aa45b2fd894b61b83581b9a9")
 
-    with default_args(type=("build", "run")):
-        depends_on("python@3.7:", when="@0.2.9:")
-        depends_on("py-sphinx@2.2:", when="@0.2.11:")
+    depends_on("py-setuptools@61.0:", type="build")
+    depends_on("py-versioneer+toml", type="build")
+    depends_on("py-sphinx@2.2:7", type=("build", "run"))