llvm: Remove python bindings when >= v17 (#41160)

Co-authored-by: Tom Scogland <scogland1@llnl.gov>

.github/workflows/build-containers.yml

@@ -113,7 +113,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build & Deploy ${{ matrix.dockerfile[0] }}
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09
+        uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56
         with:
           context: dockerfiles/${{ matrix.dockerfile[0] }}
           platforms: ${{ matrix.dockerfile[1] }}

lib/spack/docs/build_settings.rst

@@ -37,7 +37,11 @@ to enable reuse for a single installation, and you can use:
    spack install --fresh <spec>
 
 to do a fresh install if ``reuse`` is enabled by default.
-``reuse: true`` is the default.
+``reuse: dependencies`` is the default.
+
+.. seealso::
+
+   FAQ: :ref:`Why does Spack pick particular versions and variants? <faq-concretizer-precedence>`
 
 ------------------------------------------
 Selection of the target microarchitectures

lib/spack/docs/frequently_asked_questions.rst

@@ -0,0 +1,77 @@
+.. Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+   Spack Project Developers. See the top-level COPYRIGHT file for details.
+
+   SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+==========================
+Frequently Asked Questions
+==========================
+
+This page contains answers to frequently asked questions about Spack.
+If you have questions that are not answered here, feel free to ask on
+`Slack <https://slack.spack.io>`_ or `GitHub Discussions
+<https://github.com/spack/spack/discussions>`_. If you've learned the
+answer to a question that you think should be here, please consider
+contributing to this page.
+
+.. _faq-concretizer-precedence:
+
+-----------------------------------------------------
+Why does Spack pick particular versions and variants?
+-----------------------------------------------------
+
+This question comes up in a variety of forms:
+
+ 1. Why does Spack seem to ignore my package preferences from ``packages.yaml`` config?
+ 2. Why does Spack toggle a variant instead of using the default from the ``package.py`` file?
+
+The short answer is that Spack always picks an optimal configuration
+based on a complex set of criteria\ [#f1]_. These criteria are more nuanced
+than always choosing the latest versions or default variants.
+
+.. note::
+
+    As a rule of thumb: requirements + constraints > reuse > preferences > defaults.
+
+The following set of criteria (from lowest to highest precedence) explain
+common cases where concretization output may seem surprising at first.
+
+1. :ref:`Package preferences <package-preferences>` configured in ``packages.yaml``
+   override variant defaults from ``package.py`` files, and influence the optimal
+   ordering of versions. Preferences are specified as follows:
+
+   .. code-block:: yaml
+
+      packages:
+        foo:
+          version: [1.0, 1.1]
+          variants: ~mpi
+
+2. :ref:`Reuse concretization <concretizer-options>` configured in ``concretizer.yaml``
+   overrides preferences, since it's typically faster to reuse an existing spec than to
+   build a preferred one from sources. When build caches are enabled, specs may be reused
+   from a remote location too. Reuse concretization is configured as follows:
+
+   .. code-block:: yaml
+
+      concretizer:
+        reuse: dependencies  # other options are 'true' and 'false'
+
+3. :ref:`Package requirements <package-requirements>` configured in ``packages.yaml``,
+   and constraints from the command line as well as ``package.py`` files override all
+   of the above. Requirements are specified as follows:
+
+   .. code-block:: yaml
+
+      packages:
+        foo:
+          require:
+          - "@1.2: +mpi"
+
+Requirements and constraints restrict the set of possible solutions, while reuse
+behavior and preferences influence what an optimal solution looks like.
+
+
+.. rubric:: Footnotes
+
+.. [#f1] The exact list of criteria can be retrieved with the ``spack solve`` command

lib/spack/docs/index.rst

@@ -55,6 +55,7 @@ or refer to the full manual below.
    getting_started
    basic_usage
    replace_conda_homebrew
+   frequently_asked_questions
 
 .. toctree::
    :maxdepth: 2

lib/spack/docs/packages_yaml.rst

@@ -256,6 +256,11 @@ on the command line, because it can specify constraints on packages
 is not possible to specify constraints on dependencies while also keeping
 those dependencies optional.
 
+.. seealso::
+
+   FAQ: :ref:`Why does Spack pick particular versions and variants? <faq-concretizer-precedence>`
+
+
 ^^^^^^^^^^^^^^^^^^^
 Requirements syntax
 ^^^^^^^^^^^^^^^^^^^
@@ -435,6 +440,11 @@ them if it must, due to other constraints, and also prefers reusing
 installed packages over building new ones that are a better match for
 preferences.
 
+.. seealso::
+
+   FAQ: :ref:`Why does Spack pick particular versions and variants? <faq-concretizer-precedence>`
+
+
 Most package preferences (``compilers``, ``target`` and ``providers``)
 can only be set globally under the ``all`` section of ``packages.yaml``:
 

lib/spack/spack/build_systems/oneapi.py

@@ -179,6 +179,35 @@ def libs(self):
         return find_libraries("*", root=lib_path, shared=True, recursive=True)
 
 
+class IntelOneApiLibraryPackageWithSdk(IntelOneApiPackage):
+    """Base class for Intel oneAPI library packages with SDK components.
+
+    Contains some convenient default implementations for libraries
+    that expose functionality in sdk subdirectories.
+    Implement the method directly in the package if something
+    different is needed.
+
+    """
+
+    @property
+    def include(self):
+        return join_path(self.component_prefix, "sdk", "include")
+
+    @property
+    def headers(self):
+        return find_headers("*", self.include, recursive=True)
+
+    @property
+    def lib(self):
+        lib_path = join_path(self.component_prefix, "sdk", "lib64")
+        lib_path = lib_path if isdir(lib_path) else dirname(lib_path)
+        return lib_path
+
+    @property
+    def libs(self):
+        return find_libraries("*", root=self.lib, shared=True, recursive=True)
+
+
 class IntelOneApiStaticLibraryList:
     """Provides ld_flags when static linking is needed
 

lib/spack/spack/package.py

@@ -52,6 +52,7 @@
 from spack.build_systems.oneapi import (
     INTEL_MATH_LIBRARIES,
     IntelOneApiLibraryPackage,
+    IntelOneApiLibraryPackageWithSdk,
     IntelOneApiPackage,
     IntelOneApiStaticLibraryList,
 )

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

@@ -197,14 +197,18 @@ spack:
   - amrex +sycl
   - arborx +sycl ^kokkos +sycl +openmp cxxstd=17 +tests +examples
   - cabana +sycl ^kokkos +sycl +openmp cxxstd=17 +tests +examples
+  - ginkgo +sycl
+  - heffte +sycl
   - kokkos +sycl +openmp cxxstd=17 +tests +examples
   - kokkos-kernels build_type=Release %oneapi ^kokkos +sycl +openmp cxxstd=17 +tests +examples
+  - petsc +sycl
   - slate +sycl
   - sundials +sycl cxxstd=17 +examples-install
   - tau +mpi +opencl +level_zero ~pdt +syscall   # tau: requires libdrm.so to be installed
+  - upcxx +level_zero
   # --
-  # - ginkgo +oneapi                    # InstallError: Ginkgo's oneAPI backend requires theDPC++ compiler as main CXX compiler.
   # - hpctoolkit +level_zero            # dyninst@12.3.0%gcc: /usr/bin/ld: libiberty/./d-demangle.c:142: undefined reference to `_intel_fast_memcpy'; can't mix intel-tbb@%oneapi with dyninst%gcc
+  # - warpx compute=sycl                # warpx: spack-build-wzp6vvo/_deps/fetchedamrex-src/Src/Base/AMReX_RandomEngine.H:18:10: fatal error: 'oneapi/mkl/rng/device.hpp' file not found
 
   - py-scipy
 

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

@@ -16,7 +16,6 @@ class Alpgen(CMakePackage, MakefilePackage):
     homepage = "http://mlm.home.cern.ch/mlm/alpgen/"
     url = "http://mlm.home.cern.ch/mlm/alpgen/V2.1/v214.tgz"
 
-    maintainers("iarspider")
     tags = ["hep"]
 
     version("2.1.4", sha256="2f43f7f526793fe5f81a3a3e1adeffe21b653a7f5851efc599ed69ea13985c5e")

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

@@ -14,6 +14,7 @@ class Bfs(MakefilePackage):
 
     maintainers("alecbcs")
 
+    version("3.0.4", sha256="7196f5a624871c91ad051752ea21043c198a875189e08c70ab3167567a72889d")
     version("3.0.2", sha256="d3456a9aeecc031064db0dbe012e55a11eb97be88d0ab33a90e570fe66457f92")
     version("3.0.1", sha256="a38bb704201ed29f4e0b989fb2ab3791ca51c3eff90acfc31fff424579bbf962")
 

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

@@ -110,9 +110,13 @@ class Catch2(CMakePackage):
     )
     variant("shared", when="@3:", default=False, description="Build shared library")
 
+    variant(
+        "cxxstd", default="14", values=("14", "17"), multi=False, description="Define C++ standard"
+    )
+
     def cmake_args(self):
         spec = self.spec
-        args = []
+        args = [self.define_from_variant("CMAKE_CXX_STANDARD", "cxxstd")]
         # 1.7.0-1.9.3: no control over test builds
         if spec.satisfies("@1.9.4:2.1.0"):
             args.append("-DNO_SELFTEST={0}".format("OFF" if self.run_tests else "ON"))

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

@@ -14,7 +14,6 @@ class Cool(CMakePackage):
     git = "https://gitlab.cern.ch/lcgcool/cool.git"
 
     tags = ["hep"]
-    maintainers("iarspider")
 
     version("3.3.10", tag="COOL_3_3_10", commit="110b51c2b50af07cbe1f64a1c67ce9f737c4421d")
     version("3.3.7", tag="COOL_3_3_7", commit="6f9a29d903e51ecbb26bdc8a694a67db9f28e234")

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

@@ -18,6 +18,8 @@ class Doxygen(CMakePackage):
     homepage = "https://www.doxygen.org"
     url = "https://github.com/doxygen/doxygen/archive/refs/tags/Release_1_9_5.tar.gz"
 
+    version("1.9.8", sha256="77371e8a58d22d5e03c52729844d1043e9cbf8d0005ec5112ffa4c8f509ddde8")
+    version("1.9.7", sha256="691777992a7240ed1f822a5c2ff2c4273b57c1cf9fc143553d87f91a0c5970ee")
     version("1.9.6", sha256="2a3ee47f7276b759f74bac7614c05a1296a5b028d3f6a79a88e4c213db78e7dc")
     version("1.9.5", sha256="1c5c9cd4445f694e43f089c17529caae6fe889b732fb0b145211025a1fcda1bb")
     version("1.9.4", sha256="1b083d15b29817463129ae1ae73b930d883030eeec090ea7a99b3a04fdb51c76")

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

@@ -13,8 +13,6 @@ class Dwz(MakefilePackage, SourcewarePackage):
     sourceware_mirror_path = "dwz/releases/dwz-0.14.tar.gz"
     git = "git://sourceware.org/git/dwz.git"
 
-    maintainers("iarspider")
-
     depends_on("elf")
 
     version("0.14-patches", branch="dwz-0.14-branch")

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

@@ -23,7 +23,8 @@ class Ecflow(CMakePackage):
 
     maintainers("climbfuji", "AlexanderRichert-NOAA")
 
-    # https://confluence.ecmwf.int/download/attachments/8650755/ecFlow-5.8.3-Source.tar.gz?api=v2
+    version("5.11.4", sha256="4836a876277c9a65a47a3dc87cae116c3009699f8a25bab4e3afabf160bcf212")
+    version("5.8.4", sha256="bc628556f8458c269a309e4c3b8d5a807fae7dfd415e27416fe9a3f544f88951")
     version("5.8.3", sha256="1d890008414017da578dbd5a95cb1b4d599f01d5a3bb3e0297fe94a87fbd81a6")
     version("4.13.0", sha256="c743896e0ec1d705edd2abf2ee5a47f4b6f7b1818d8c159b521bdff50a403e39")
     version("4.12.0", sha256="566b797e8d78e3eb93946b923ef540ac61f50d4a17c9203d263c4fd5c39ab1d1")
@@ -99,6 +100,9 @@ def cmake_args(self):
             ssllibs = ";".join(spec["openssl"].libs + spec["zlib"].libs)
             args.append(self.define("OPENSSL_CRYPTO_LIBRARY", ssllibs))
 
+        if self.spec.satisfies("@5.8.3:"):
+            args.append("-DCMAKE_CXX_FLAGS=-DBOOST_NO_CXX98_FUNCTION_BASE")
+
         return args
 
     # A recursive link in the ecflow source code causes the binary cache

var/spack/repos/builtin/packages/ecmwf-atlas/package.py

@@ -76,8 +76,8 @@ def cmake_args(self):
 
     @when("+fismahigh")
     def patch(self):
-        filter_file("http://www\.ecmwf\.int", "", "cmake/atlas-import.cmake.in")  # noqa: W605
-        filter_file("int\.ecmwf", "", "cmake/atlas-import.cmake.in")  # noqa: W605
+        filter_file("http://www.ecmwf.int", "", "cmake/atlas-import.cmake.in", string=True)
+        filter_file("int.ecmwf", "", "cmake/atlas-import.cmake.in", string=True)
         filter_file('http[^"]+', "", "cmake/atlas_export.cmake")
         patterns = [".travis.yml", "tools/install*.sh", "tools/github-sha.sh"]
         for pattern in patterns:

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

@@ -16,9 +16,13 @@ class Elbencho(MakefilePackage):
 
     homepage = "https://github.com/breuner/elbencho"
     url = "https://github.com/breuner/elbencho/archive/refs/tags/v3.0-1.tar.gz"
+    git = "https://github.com/breuner/elbencho.git"
 
     maintainers("ethanjjjjjjj")
 
+    version("master", branch="master")
+
+    version("3.0-3", sha256="5769abcdaebefe2984ac3053fb6e91a54e1863d5ea8f72daea830e10b27c0eaf")
     version("3.0-1", sha256="19dad85e1fc74419dcdf740f11a47d3f6d566770a06e40976755a3404566c11d")
     version("2.2-5", sha256="4b598639452665a8b79c4c9d8a22ae63fb9b04057635a45e686aa3939ee255b4")
     version("2.2-3", sha256="0ae2d495d2863b84f21f55b7c526674fab1be723d0697087017946647f79d0e6")

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

@@ -20,6 +20,7 @@ class FluxCore(AutotoolsPackage):
     maintainers("grondo")
 
     version("master", branch="master")
+    version("0.56.0", sha256="dfce5aa21bcb1f990397343cdff8a60542b2d18cbd929e46bdb444d21a961efb")
     version("0.55.0", sha256="2925b8a084e9d1069a96de7689b515ad6f2051ecfb9fbbe4d2643507de7ccd30")
     version("0.54.0", sha256="721fc3fff64b3b167ae55d0e29379ff3211729248ef97e3b9855816219063b42")
     version("0.53.0", sha256="2f14d032a2d54f34e066c8a15c79917089e9f7f8558baa03dbfe63dbf56918b7")

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

@@ -22,6 +22,7 @@ class FluxSched(CMakePackage, AutotoolsPackage):
     maintainers("grondo")
 
     version("master", branch="master")
+    version("0.30.0", sha256="1ccb2e53f4caede0233f19b2707e868f0cee9d2c957a06f97c22936ba9a43552")
     version("0.29.0", sha256="b93b18788e677535aa8ef945cdbeeced6d1408a4d16cb4a816ead53f31dd78d2")
     version("0.28.0", sha256="9431c671bed5d76fd95b4a4a7f36224d4bf76f416a2a1a5c4908f3ca790d434d")
     version("0.27.0", sha256="1e131924440c904fa0c925b7aa14c47b97f4e67b43af7efd2ebc0ef7ce90eb7c")

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

@@ -20,6 +20,7 @@ class FluxSecurity(AutotoolsPackage):
     maintainers("grondo")
 
     version("master", branch="master")
+    version("0.11.0", sha256="d1ef78a871155a252f07e4f0a636eb272d6c2048d5e0e943860dd687c6cf808a")
     version("0.10.0", sha256="b0f39c5e32322f901454469ffd6154019b6dffafc064b55b3e593f70db6a6f68")
     version("0.9.0", sha256="2258120c6f32ca0b5b13b166bae56d9bd82a44c6eeaa6bc6187e4a4419bdbcc0")
     version("0.8.0", sha256="9963628063b4abdff6bece03208444c8f23fbfda33c20544c48b21e9f4819ce2")

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

@@ -11,7 +11,7 @@ class Form(AutotoolsPackage):
 
     homepage = "https://www.nikhef.nl/~form/"
     url = "https://github.com/vermaseren/form/releases/download/v4.2.1/form-4.2.1.tar.gz"
-    maintainers("iarspider", "tueda")
+    maintainers("tueda")
 
     version("4.3.1", sha256="f1f512dc34fe9bbd6b19f2dfef05fcb9912dfb43c8368a75b796ec472ee8bbce")
     version("4.3.0", sha256="b234e0d095f73ecb0904cdc3b0d8d8323a9fa7f46770a52fb22267c624aafbf6")

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

@@ -12,7 +12,6 @@ class Gbl(CMakePackage):
     homepage = "https://www.desy.de/~kleinwrt/GBL/doc/cpp/html/"
     git = "https://gitlab.desy.de/claus.kleinwort/general-broken-lines.git"
 
-    maintainers("iarspider")
     tags = ["hep"]
 
     version("V02-04-01", commit="1061b643c6656fbf7ceba579997eb43f0a9e9d3c")

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

@@ -22,6 +22,7 @@ class Geant4(CMakePackage):
 
     maintainers("drbenmorgan")
 
+    version("11.1.3", sha256="5d9a05d4ccf8b975649eab1d615fc1b8dce5937e01ab9e795bffd04149240db6")
     version("11.1.2", sha256="e9df8ad18c445d9213f028fd9537e174d6badb59d94bab4eeae32f665beb89af")
     version("11.1.1", sha256="c5878634da9ba6765ce35a469b2893044f4a6598aa948733da8436cdbfeef7d2")
     version("11.1.0", sha256="c4a23f2f502efeab56de43a4412b21f65c7ca1b0877b9bc1d7e845ee12edf70a")
@@ -152,7 +153,7 @@ def std_when(values):
     patch("geant4-10.4.3-cxx17-removed-features.patch", level=1, when="@10.4.3 cxxstd=17")
 
     # See https://bugzilla-geant4.kek.jp/show_bug.cgi?id=2556
-    patch("package-cache.patch", level=1, when="@10.7.0:11.2.0^cmake@3.17:")
+    patch("package-cache.patch", level=1, when="@10.7.0:11.1.2^cmake@3.17:")
 
     # NVHPC: "thread-local declaration follows non-thread-local declaration"
     conflicts("%nvhpc", when="+threads")

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

@@ -14,6 +14,7 @@ class Glab(Package):
 
     maintainers("alecbcs")
 
+    version("1.35.0", sha256="7ed31c7a9b425fc15922f83c5dd8634a2758262a4f25f92583378655fcad6303")
     version("1.33.0", sha256="447a9b76acb5377642a4975908f610a3082026c176329c7c8cfed1461d2e1570")
     version("1.31.0", sha256="5648e88e7d6cc993227f5a4e80238af189bed09c7aed1eb12be7408e9a042747")
     version("1.30.0", sha256="d3c1a9ba723d94a0be10fc343717cf7b61732644f5c42922f1c8d81047164b99")

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

@@ -90,9 +90,26 @@ class Gromacs(CMakePackage, CudaPackage):
         default=False,
         description="Produces a double precision version of the executables",
     )
-    variant("cufftmp", default=False, when="+cuda+mpi", description="Enable Multi GPU FFT support")
+    variant(
+        "cufftmp",
+        default=False,
+        when="@2022: +cuda+mpi",
+        description="Enable multi-GPU FFT support with cuFFTMp",
+    )
+    variant(
+        "heffte",
+        default=False,
+        when="@2021: +sycl+mpi",
+        description="Enable multi-GPU FFT support with HeFFTe",
+    )
     variant("opencl", default=False, description="Enable OpenCL support")
-    variant("sycl", default=False, description="Enable SYCL support")
+    variant("sycl", default=False, when="@2021:", description="Enable SYCL support")
+    variant(
+        "intel-data-center-gpu-max",
+        default=False,
+        when="@2022:",
+        description="Enable support for Intel Data Center GPU Max",
+    )
     variant("nosuffix", default=False, description="Disable default suffixes")
     variant(
         "build_type",
@@ -108,6 +125,18 @@ class Gromacs(CMakePackage, CudaPackage):
             "Profile",
         ),
     )
+    variant(
+        "nblib",
+        default=True,
+        when="@2021:",
+        description="Build and install the NB-LIB C++ API for GROMACS",
+    )
+    variant(
+        "gmxapi",
+        default=True,
+        when="@2019:",
+        description="Build and install the gmxlib python API for GROMACS",
+    )
     variant(
         "mdrun_only",
         default=False,
@@ -254,6 +283,7 @@ class Gromacs(CMakePackage, CudaPackage):
     depends_on("cp2k@8.1:", when="+cp2k")
 
     depends_on("nvhpc", when="+cufftmp")
+    depends_on("heffte", when="+heffte")
 
     requires(
         "%intel",
@@ -516,6 +546,19 @@ def cmake_args(self):
                 + f'/{self.spec["nvhpc"].version}/math_libs'
             )
 
+        if "+heffte" in self.spec:
+            options.append("-DGMX_USE_HEFFTE=on")
+            options.append(f'-DHeffte_ROOT={self.spec["heffte"].prefix}')
+
+        if "+intel-data-center-gpu-max" in self.spec:
+            options.append("-DGMX_GPU_NB_CLUSTER_SIZE=8")
+            options.append("-DGMX_GPU_NB_NUM_CLUSTER_PER_CELL_X=1")
+
+        if "~nblib" in self.spec:
+            options.append("-DGMX_INSTALL_NBLIB_API=OFF")
+        if "~gmxapi" in self.spec:
+            options.append("-DGMXAPI=OFF")
+
         # Activate SIMD based on properties of the target
         target = self.spec.target
         if target >= "zen4":

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

@@ -38,6 +38,12 @@ class Heffte(CMakePackage, CudaPackage, ROCmPackage):
 
     variant("shared", default=True, description="Builds with shared libraries")
     variant("fftw", default=False, description="Builds with support for FFTW backend")
+    variant(
+        "sycl",
+        default=False,
+        when="%oneapi",
+        description="Builds with support for oneAPI SYCL+oneMKL backend",
+    )
     variant("mkl", default=False, description="Builds with support for MKL backend")
     variant("magma", default=False, description="Use helper methods from the UTK MAGMA library")
     variant("python", default=False, description="Install the Python bindings")
@@ -68,6 +74,8 @@ class Heffte(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("rocsparse@3.8:", when="+magma+rocm", type=("build", "run"))
     depends_on("hipblas@3.8:", when="+magma+rocm", type=("build", "run"))
     depends_on("hipsparse@3.8:", when="+magma+rocm", type=("build", "run"))
+    depends_on("intel-oneapi-mkl@2023.2.0:", when="+sycl", type=("build", "run"))
+    depends_on("intel-oneapi-mpi@2021.10.0:", when="+sycl", type=("build", "run"))
 
     examples_src_dir = "examples"
 
@@ -78,6 +86,7 @@ def cmake_args(self):
             self.define_from_variant("BUILD_SHARED_LIBS", "shared"),
             self.define_from_variant("Heffte_ENABLE_CUDA", "cuda"),
             self.define_from_variant("Heffte_ENABLE_ROCM", "rocm"),
+            self.define_from_variant("Heffte_ENABLE_ONEAPI", "sycl"),
             self.define_from_variant("Heffte_ENABLE_FFTW", "fftw"),
             self.define_from_variant("Heffte_ENABLE_MKL", "mkl"),
             self.define_from_variant("Heffte_ENABLE_MAGMA", "magma"),

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

@@ -39,7 +39,7 @@ class Hydrogen(CachedCMakePackage, CudaPackage, ROCmPackage):
         values=("Debug", "Release"),
     )
     variant("int64", default=False, description="Use 64-bit integers")
-    variant("al", default=False, description="Use Aluminum communication library")
+    variant("al", default=True, sticky=True, description="Use Aluminum communication library")
     variant(
         "cub", default=True, when="+cuda", description="Use CUB/hipCUB for GPU memory management"
     )
@@ -90,6 +90,7 @@ class Hydrogen(CachedCMakePackage, CudaPackage, ROCmPackage):
     # Note that this forces us to use OpenBLAS until #1712 is fixed
     depends_on("openblas", when="blas=openblas")
     depends_on("openblas +ilp64", when="blas=openblas +int64_blas")
+    depends_on("openblas@0.3.21:0.3.23", when="blas=openblas arch=ppc64le:")
 
     depends_on("intel-mkl", when="blas=mkl")
     depends_on("intel-mkl +ilp64", when="blas=mkl +int64_blas")

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

@@ -7,7 +7,7 @@
 
 
 @IntelOneApiPackage.update_description
-class IntelOneapiAdvisor(IntelOneApiPackage):
+class IntelOneapiAdvisor(IntelOneApiLibraryPackageWithSdk):
     """Intel Advisor is a design and analysis tool for developing
     performant code. The tool supports C, C++, Fortran, SYCL, OpenMP,
     OpenCL code, and Python. It helps with the following: Performant

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

@@ -7,7 +7,7 @@
 
 
 @IntelOneApiPackage.update_description
-class IntelOneapiInspector(IntelOneApiPackage):
+class IntelOneapiInspector(IntelOneApiLibraryPackageWithSdk):
     """Intel Inspector is a dynamic memory and threading error debugger
     for C, C++, and Fortran applications that run on Windows and Linux
     operating systems.  Save money: locate the root cause of memory,

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

@@ -7,7 +7,7 @@
 
 
 @IntelOneApiPackage.update_description
-class IntelOneapiVtune(IntelOneApiPackage):
+class IntelOneapiVtune(IntelOneApiLibraryPackageWithSdk):
     """Intel VTune Profiler is a profiler to optimize application
     performance, system performance, and system configuration for HPC,
     cloud, IoT, media, storage, and more.  CPU, GPU, and FPGA: Tune

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

@@ -13,8 +13,6 @@ class Jemalloc(AutotoolsPackage):
     homepage = "http://jemalloc.net/"
     url = "https://github.com/jemalloc/jemalloc/releases/download/4.0.4/jemalloc-4.0.4.tar.bz2"
 
-    maintainers("iarspider")
-
     version("5.3.0", sha256="2db82d1e7119df3e71b7640219b6dfe84789bc0537983c3b7ac4f7189aecfeaa")
     version("5.2.1", sha256="34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6")
     version("5.2.0", sha256="74be9f44a60d2a99398e706baa921e4efde82bf8fd16e5c0643c375c5851e3b4")

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

@@ -19,6 +19,7 @@ class Lcio(CMakePackage):
     maintainers("gaede", "vvolkl", "jmcarcell")
 
     version("master", branch="master")
+    version("2.20.1", sha256="125f657297de12b40694cb0dddec1d1ce3379058492f2a6a2a6f992ee51604d6")
     version("2.20", sha256="5ef92c9ef04ce468ffb48be0ec6010377a400b064e352cb50f9f4c9599e7e990")
     version("2.19", sha256="2d6b37094d8d556ab0ba0efa632f10d8b851f533ca5c767e436397df18cb57c7")
     version("2.18", sha256="e722df7f4a6adcc2459ea1c6488a2a6e40bb04f7ee99536fdc60b51e6c80f565")

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

@@ -17,6 +17,7 @@ class Libksba(AutotoolsPackage):
 
     maintainers("alalazo")
 
+    version("1.6.5", sha256="a564628c574c99287998753f98d750babd91a4e9db451f46ad140466ef2a6d16")
     version("1.6.4", sha256="bbb43f032b9164d86c781ffe42213a83bf4f2fee91455edfa4654521b8b03b6b")
     version("1.6.3", sha256="3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c")
 

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

@@ -428,6 +428,12 @@ class Llvm(CMakePackage, CudaPackage):
         when="@14:15",
     )
 
+    # missing <cstdint> include
+    patch(
+        "https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch?full_index=1",
+        sha256="c6ca6b925f150e8644ce756023797b7f94c9619c62507231f979edab1c09af78",
+        when="@6:13",
+    )
     # fix building of older versions of llvm with newer versions of glibc
     for compiler_rt_as in ["project", "runtime"]:
         with when("compiler-rt={0}".format(compiler_rt_as)):
@@ -977,7 +983,10 @@ def post_install(self):
                 ninja()
                 ninja("install")
         if "+python" in self.spec:
-            install_tree("llvm/bindings/python", python_platlib)
+            if spec.version < Version("17.0.0"):
+                # llvm bindings were removed in v17:
+                # https://releases.llvm.org/17.0.1/docs/ReleaseNotes.html#changes-to-the-python-bindings
+                install_tree("llvm/bindings/python", python_platlib)
 
             if "+clang" in self.spec:
                 install_tree("clang/bindings/python", python_platlib)

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

@@ -14,8 +14,6 @@ class Millepede(MakefilePackage):
     homepage = "https://gitlab.desy.de/claus.kleinwort/millepede-ii"
     url = "https://gitlab.desy.de/claus.kleinwort/millepede-ii/-/archive/V04-11-01/millepede-ii-V04-11-01.tar.gz"
 
-    maintainers("iarspider")
-
     parallel = False
 
     version("04-13-03", sha256="669a6e46a6f02ba3c78b2760e2ffb2c90d25b582ccd1a5c0770eef81c7bcbbe9")

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

@@ -70,16 +70,14 @@ class Mpich(AutotoolsPackage, CudaPackage, ROCmPackage):
         description="""Abstract Device Interface (ADI)
 implementation. The ch4 device is in experimental state for versions
 before 3.4.""",
-        values=("ch3", "ch4"),
+        values=("ch3", "ch4", "ch3:sock"),
         multi=False,
     )
     variant(
         "netmod",
         default="ofi",
         description="""Network module. Only single netmod builds are
-supported. For ch3 device configurations, this presumes the
-ch3:nemesis communication channel. ch3:sock is not supported by this
-spack package at this time.""",
+supported, and netmod is ignored if device is ch3:sock.""",
         values=("tcp", "mxm", "ofi", "ucx"),
         multi=False,
     )
@@ -121,6 +119,7 @@ class Mpich(AutotoolsPackage, CudaPackage, ROCmPackage):
     depends_on("yaksa+cuda", when="+cuda ^yaksa")
     depends_on("yaksa+rocm", when="+rocm ^yaksa")
     conflicts("datatype-engine=yaksa", when="device=ch3")
+    conflicts("datatype-engine=yaksa", when="device=ch3:sock")
 
     variant(
         "hcoll",
@@ -135,8 +134,10 @@ class Mpich(AutotoolsPackage, CudaPackage, ROCmPackage):
     # overriding the variant from CudaPackage.
     conflicts("+cuda", when="@:3.3")
     conflicts("+cuda", when="device=ch3")
+    conflicts("+cuda", when="device=ch3:sock")
     conflicts("+rocm", when="@:4.0")
     conflicts("+rocm", when="device=ch3")
+    conflicts("+rocm", when="device=ch3:sock")
     conflicts("+cuda", when="+rocm", msg="CUDA must be disabled to support ROCm")
 
     provides("mpi@:4.0")
@@ -271,6 +272,7 @@ class Mpich(AutotoolsPackage, CudaPackage, ROCmPackage):
     conflicts("netmod=tcp", when="device=ch4")
     conflicts("pmi=pmi2", when="device=ch3 netmod=ofi")
     conflicts("pmi=pmix", when="device=ch3")
+    conflicts("pmi=pmix", when="device=ch3:sock")
     conflicts("pmi=pmix", when="+hydra")
     conflicts("pmi=cray", when="+hydra")
 
@@ -556,7 +558,10 @@ def configure_args(self):
         elif "device=ch3" in spec:
             device_config = "--with-device=ch3:nemesis:"
 
-        if "netmod=ucx" in spec:
+        # Do not apply any netmod if device is ch3:sock
+        if "device=ch3:sock" in spec:
+            device_config = "--with-device=ch3:sock"
+        elif "netmod=ucx" in spec:
             device_config += "ucx"
         elif "netmod=ofi" in spec:
             device_config += "ofi"

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

@@ -26,9 +26,10 @@ def patch(self):
         patched_file = "configure"
         with keep_modification_time(patched_file):
             filter_file(
-                "if test x\$CC_TEST_SAME != x\$NETCDF_CC_TEST_SAME; then",  # noqa: W605
+                "if test x$CC_TEST_SAME != x$NETCDF_CC_TEST_SAME; then",
                 "if false; then",
                 patched_file,
+                string=True,
             )
 
     def url_for_version(self, version):

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

@@ -13,49 +13,16 @@ class Npm(Package):
     """npm: A package manager for javascript."""
 
     homepage = "https://github.com/npm/cli"
-    # base https://www.npmjs.com/
-
-    git = "https://github.com/npm/cli.git"
     url = "https://registry.npmjs.org/npm/-/npm-9.3.1.tgz"
+    git = "https://github.com/npm/cli.git"
 
     version("9.3.1", sha256="41caa26a340b0562bc5429d28792049c980fe3e872b42b82cad94e8f70e37f40")
     version("8.19.3", sha256="634bf4e0dc87be771ebf48a058629960e979a209c20a51ebdbc4897ca6a25260")
     version("7.24.2", sha256="5b9eeea011f8bc3b76e55cc33339e87213800677f37e0756ad13ef0e9eaccd64")
     version("6.14.18", sha256="c9b15f277e2a0b1b57e05bad04504296a27024555d56c2aa967f862e957ad2ed")
 
-    version(
-        "6.14.9",
-        sha256="1e0e880ce0d5adf0120fb3f92fc8e5ea5bac73681d37282615d074ff670f7703",
-        deprecated=True,
-    )
-    version(
-        "6.14.8",
-        sha256="fe8e873cb606c06f67f666b4725eb9122c8927f677c8c0baf1477f0ff81f5a2c",
-        deprecated=True,
-    )
-    version(
-        "6.13.7",
-        sha256="6adf71c198d61a5790cf0e057f4ab72c6ef6c345d72bed8bb7212cb9db969494",
-        deprecated=True,
-    )
-    version(
-        "6.13.4",
-        sha256="a063290bd5fa06a8753de14169b7b243750432f42d01213fbd699e6b85916de7",
-        deprecated=True,
-    )
-    version(
-        "3.10.9",
-        sha256="fb0871b1aebf4b74717a72289fade356aedca83ee54e7386e38cb51874501dd6",
-        deprecated=True,
-    )
-    version(
-        "3.10.5",
-        sha256="ff019769e186152098841c1fa6325e5a79f7903a45f13bd0046a4dc8e63f845f",
-        deprecated=True,
-    )
-
     depends_on("node-js", type=("build", "run"))
-    depends_on("libvips")
+    depends_on("libvips", when="@:7")
 
     # npm 6.13.4 ships with node-gyp 5.0.5, which contains several Python 3
     # compatibility issues on macOS. Manually update to node-gyp 6.0.1 for

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

@@ -192,6 +192,13 @@ class Openblas(CMakePackage, MakefilePackage):
         when="@0.3.21 %gcc@:9",
     )
 
+    # Fix build on A64FX for OpenBLAS v0.3.24
+    patch(
+        "https://github.com/OpenMathLib/OpenBLAS/commit/90231bfc4e4afc51f67c248328fbef0cecdbd2c2.patch?full_index=1",
+        sha256="139e314f3408dc5c080d28887471f382e829d1bd06c8655eb72593e4e7b921cc",
+        when="@0.3.24 target=a64fx",
+    )
+
     # See https://github.com/spack/spack/issues/19932#issuecomment-733452619
     # Notice: fixed on Amazon Linux GCC 7.3.1 (which is an unofficial version
     # as GCC only has major.minor releases. But the bound :7.3.0 doesn't hurt)
@@ -370,6 +377,14 @@ def _microarch_target_args(self):
             # case can go away.
             args.append("TARGET=" + "RISCV64_GENERIC")
 
+        elif self.spec.satisfies("@0.3.19: target=a64fx"):
+            # Special case for Fujitsu's A64FX
+            if any(self.spec.satisfies(i) for i in ["%gcc@11:", "%clang", "%fj"]):
+                args.append("TARGET=A64FX")
+            else:
+                # fallback to armv8-a+sve without -mtune=a64fx flag
+                args.append("TARGET=ARMV8SVE")
+
         else:
             args.append("TARGET=" + microarch.name.upper())
 

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

@@ -9,8 +9,6 @@
 class Pacparser(MakefilePackage):
     """pacparser is a library to parse proxy auto-config (PAC) files."""
 
-    maintainers("iarspider")
-
     homepage = "https://pacparser.github.io/"
     url = "https://github.com/manugarg/pacparser/releases/download/v1.4.0/pacparser-v1.4.0.tar.gz"
     git = "https://github.com/manugarg/pacparser.git"

var/spack/repos/builtin/packages/photos-f/package.py

@@ -18,8 +18,6 @@ class PhotosF(MakefilePackage):
         "http://cern.ch/service-spi/external/MCGenerators/distribution/photos/photos-215.5-src.tgz"
     )
 
-    maintainers("iarspider")
-
     version("215.5", sha256="3e2b3f60ffe2d3a6a95cf2f156aa24b93e1fa3c439a85fa0ae780ca2f6e0dbb5")
 
     patch("photos-215.5-update-configure.patch", level=2)

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

@@ -15,8 +15,9 @@ class PyArchspec(PythonPackage):
 
     maintainers("alalazo")
 
+    version("0.2.2", sha256="d922c9fd80a5234d8cef883fbe0e146b381c449062c0405f91714ebad1edc035")
     version("0.2.1", sha256="0974a8a95831d2d43cce906c5b79a35d5fd2bf9be478b0e3b7d83ccc51ac815e")
     version("0.2.0", sha256="6aaba5ebdb5c3633c400d8c221a6a18716da0c64b367a8509f4217b22e91a5f5")
 
     depends_on("py-poetry-core@1.0.0:", type="build")
-    depends_on("py-click@8", type=("build", "run"))
+    depends_on("py-click@8", type=("build", "run"), when="@:0.2.0")

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

@@ -12,8 +12,6 @@ class PyAsyncLru(PythonPackage):
     homepage = "https://github.com/wikibusiness/async_lru"
     pypi = "async-lru/async-lru-1.0.2.tar.gz"
 
-    maintainers("iarspider")
-
     version("1.0.3", sha256="c2cb9b2915eb14e6cf3e717154b40f715bf90e596d73623677affd0d1fbcd32a")
     version("1.0.2", sha256="baa898027619f5cc31b7966f96f00e4fc0df43ba206a8940a5d1af5336a477cb")
 

var/spack/repos/builtin/packages/py-backports-entry-points-selectable/package.py

@@ -12,8 +12,6 @@ class PyBackportsEntryPointsSelectable(PythonPackage):
     homepage = "https://github.com/jaraco/backports.entry_points_selectable"
     pypi = "backports.entry_points_selectable/backports.entry_points_selectable-1.1.0.tar.gz"
 
-    maintainers("iarspider")
-
     version("1.1.1", sha256="914b21a479fde881635f7af5adc7f6e38d6b274be32269070c53b698c60d5386")
     version("1.1.0", sha256="988468260ec1c196dab6ae1149260e2f5472c9110334e5d51adcb77867361f6a")
 

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

@@ -9,9 +9,10 @@
 class PyBokeh(PythonPackage):
     """Statistical and novel interactive HTML plots for Python"""
 
-    homepage = "https://github.com/bokeh/bokeh"
+    homepage = "https://bokeh.org/"
     pypi = "bokeh/bokeh-0.12.2.tar.gz"
 
+    version("3.3.1", sha256="2a7b3702d7e9f03ef4cd801b02b7380196c70cff2773859bcb84fa565218955c")
     version("2.4.3", sha256="ef33801161af379665ab7a34684f2209861e3aefd5c803a21fbbb99d94874b03")
     version("2.4.1", sha256="d0410717d743a0ac251e62480e2ea860a7341bdcd1dbe01499a904f233c90512")
     version("2.4.0", sha256="6fa00ed8baab5cca33f4175792c309fa2536eaae7e90abee884501ba8c90fddb")
@@ -20,11 +21,16 @@ class PyBokeh(PythonPackage):
     version("0.12.2", sha256="0a840f6267b6d342e1bd720deee30b693989538c49644142521d247c0f2e6939")
 
     depends_on("py-setuptools", type="build", when="@1.3.4:")
+    depends_on("py-setuptools@64:", type="build", when="@3:")
+    depends_on("py-setuptools-git-versioning", type="build", when="@3:")
+    depends_on("py-colorama", type="build", when="@3:")
 
     depends_on("python@2.6:", type=("build", "run"), when="@0.12.2")
     depends_on("python@2.7:", type=("build", "run"), when="@1.3.4:")
     depends_on("python@3.6:", type=("build", "run"), when="@2.3.3:")
     depends_on("python@3.7:", type=("build", "run"), when="@2.4.0:")
+    depends_on("python@3.8:", type=("build", "run"), when="@3.0.0:")
+    depends_on("python@3.9:", type=("build", "run"), when="@3.2.0:")
 
     depends_on("py-requests@1.2.3:", type=("build", "run"), when="@0.12.2")
     depends_on("py-six@1.5.2:", type=("build", "run"), when="@:1.3.4")
@@ -33,11 +39,16 @@ class PyBokeh(PythonPackage):
     depends_on("py-jinja2@2.7:", type=("build", "run"))
     depends_on("py-jinja2@2.9:", type=("build", "run"), when="@2.3.3:")
 
+    depends_on("py-contourpy@1:", type=("build", "run"), when="@3:")
+
     depends_on("py-numpy@1.7.1:", type=("build", "run"))
     depends_on("py-numpy@1.11.3:", type=("build", "run"), when="@2.3.3:")
+    depends_on("py-numpy@1.16:", type=("build", "run"), when="@3.1:")
 
     depends_on("py-packaging@16.8:", type=("build", "run"), when="@1.3.4:")
 
+    depends_on("py-pandas@1.2:", type=("build", "run"), when="@3:")
+
     depends_on("pil@4.0:", type=("build", "run"), when="@1.3.4:")
     depends_on("pil@7.1.0:", type=("build", "run"), when="@2.3.3:")
 
@@ -46,5 +57,7 @@ class PyBokeh(PythonPackage):
     depends_on("py-tornado@4.3:", type=("build", "run"))
     depends_on("py-tornado@5.1:", type=("build", "run"), when="@2.3.3:")
 
-    depends_on("py-typing-extensions@3.7.4:", type=("build", "run"), when="@2.3.3:")
-    depends_on("py-typing-extensions@3.10.0:", type=("build", "run"), when="@2.4.0:")
+    depends_on("py-typing-extensions@3.7.4:", type=("build", "run"), when="@2.3.3:3.0.0")
+    depends_on("py-typing-extensions@3.10.0:", type=("build", "run"), when="@2.4.0:3.0.0")
+
+    depends_on("py-xyzservices@2021.09.1:", type=("build", "run"), when="@3:")

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

@@ -12,17 +12,26 @@ class PyCleo(PythonPackage):
     homepage = "https://github.com/sdispater/cleo"
     pypi = "cleo/cleo-0.8.1.tar.gz"
 
-    version("1.0.0a5", sha256="097c9d0e0332fd53cc89fc11eb0a6ba0309e6a3933c08f7b38558555486925d3")
+    maintainers("LydDeb")
+
+    version("2.1.0", sha256="0b2c880b5d13660a7ea651001fb4acb527696c01f15c9ee650f377aa543fd523")
+    version("2.0.1", sha256="eb4b2e1f3063c11085cebe489a6e9124163c226575a3c3be69b2e51af4a15ec5")
+    version("2.0.0", sha256="fbc5cb141cbc31ea8ffd3d5cd67d3b183fa38aa5098fd37e39e9a953a232fda9")
+    version("1.0.0", sha256="bb5e4f70db83a597575ec86a1ed8fc56bd80934cfea3db97a23ea50c03b78382")
     version(
-        "0.8.1",
-        sha256="3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f",
-        preferred=True,
+        "1.0.0a5",
+        sha256="097c9d0e0332fd53cc89fc11eb0a6ba0309e6a3933c08f7b38558555486925d3",
+        deprecated=True,
     )
+    version("0.8.1", sha256="3d0e22d30117851b45970b6c14aca4ab0b18b1b53c8af57bed13208147e4069f")
 
     depends_on("python@2.7,3.4:3", type=("build", "run"))
     depends_on("python@3.7:3", when="@1:", type=("build", "run"))
     depends_on("py-poetry-core@1:", type="build")
-    depends_on("py-poetry-core@1", when="@1:", type="build")
-    depends_on("py-clikit@0.6.0:0.6", when="@0.8.1", type=("build", "run"))
-    depends_on("py-pylev@1.3:1", when="@1:", type=("build", "run"))
-    depends_on("py-crashtest@0.3.1:0.3", when="@1:", type=("build", "run"))
+    depends_on("py-poetry-core@1.1:1", when="@1:2.0.0", type="build")
+    depends_on("py-poetry-core@1.1.0:", when="@2.0.1:", type="build")
+    depends_on("py-clikit@0.6", when="@0.8.1", type=("build", "run"))
+    depends_on("py-pylev@1.3:1", when="@1.0.0a5", type=("build", "run"))
+    depends_on("py-crashtest@0.4.1:0.4", when="@1:", type=("build", "run"))
+    depends_on("py-rapidfuzz@2.2:2", when="@1:2.0", type=("build", "run"))
+    depends_on("py-rapidfuzz@3", when="@2.1:", type=("build", "run"))

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

@@ -12,8 +12,6 @@ class PyCppy(PythonPackage):
     homepage = "https://github.com/nucleic/cppy"
     pypi = "cppy/cppy-1.1.0.tar.gz"
 
-    maintainers("iarspider")
-
     version("1.2.1", sha256="83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b")
     version("1.1.0", sha256="4eda6f1952054a270f32dc11df7c5e24b259a09fddf7bfaa5f33df9fb4a29642")
 

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

@@ -13,9 +13,11 @@ class PyCrashtest(PythonPackage):
     homepage = "https://github.com/sdispater/crashtest"
     pypi = "crashtest/crashtest-0.3.1.tar.gz"
 
+    version("0.4.1", sha256="80d7b1f316ebfbd429f648076d6275c877ba30ba48979de4191714a75266f0ce")
     version("0.4.0", sha256="d629b00f1d4e79c316909f4eb763bbcb29b510d65fbde1365a1ceb93ab7fa4c8")
     version("0.3.1", sha256="42ca7b6ce88b6c7433e2ce47ea884e91ec93104a4b754998be498a8e6c3d37dd")
 
     depends_on("python@3.6:3", type=("build", "run"))
     depends_on("python@3.7:3", when="@0.4.0:", type=("build", "run"))
     depends_on("py-poetry-core@1:", type="build")
+    depends_on("py-poetry-core@1.1.0:", when="@0.4.1:", type="build")

var/spack/repos/builtin/packages/py-dlio-profiler-py/package.py

@@ -15,10 +15,17 @@ class PyDlioProfilerPy(PythonPackage):
 
     version("develop", branch="dev")
     version("master", branch="master")
+    version("0.0.2", tag="v0.0.2", commit="b72144abf1499e03d1db87ef51e780633e9e9533")
     version("0.0.1", tag="v0.0.1", commit="28affe716211315dd6936ddc8e25ce6c43cdf491")
-    depends_on("cpp-logger@0.0.1")
-    depends_on("brahma@0.0.1")
-    depends_on("gotcha@develop")
+
+    depends_on("cpp-logger@0.0.1", when="@:0.0.1")
+    depends_on("cpp-logger@0.0.2", when="@0.0.2:")
+    depends_on("brahma@0.0.1", when="@:0.0.1")
+    depends_on("brahma@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("gotcha@1.0.5", when="@0.0.2:")
+    depends_on("yaml-cpp@0.6.3", when="@0.0.2:")
     depends_on("py-setuptools@42:", type="build")
     depends_on("py-pybind11", type=("build", "run"))
     depends_on("py-ninja", type="build")

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

@@ -16,6 +16,10 @@ class PyElephant(PythonPackage):
     # list of GitHub accounts to notify when the package is updated.
     maintainers("Moritz-Alexander-Kern")
 
+    version("master", branch="master")
+    version("0.14.0", sha256="02ce3b2a8d08dc19828f95384551339ea0946bc405c1db9aace54135417c2b0f")
+    version("0.13.0", sha256="2c6463cf9ace41631f2af196c5b80b468bf1c4b264d3a6b1ea0fb587d9e7dd67")
+    version("0.12.0", sha256="81f8d668f92d8688344bb7a9c5abaa8438d824560c935a411e6e36ddf7dc7c72")
     version("0.11.2", sha256="f8759fff0bbb136ae4ffc8d1eacadeea8ba56610d705c3bf207de87ada3ba240")
     version("0.11.1", sha256="d604a202583440fdf9d95d42cef50a410bd74fcaaa1a925b139435f27ab012ef")
     version("0.11.0", sha256="7b547964dbd196361edc922db2c5a7c0c886ef1effcca6c6dc7adb06f966a3be")
@@ -28,40 +32,44 @@ class PyElephant(PythonPackage):
     version("0.3.0", sha256="747251ccfb5820bdead6391411b5faf205b4ddf3ababaefe865f50b16540cfef")
 
     variant("docs", default=False, description="Install documentation dependencies")
-    variant("pandas", default=False, description="Build with pandas", when="@0.3.0:0.4.1")
     variant(
         "extras", default=False, description="Build with extras for GPFA, ASSET", when="@0.6.4:"
     )
 
     depends_on("py-setuptools", type="build")
-    depends_on("python@3.7:", type=("build", "run"), when="@0.11.0:")
+
+    depends_on("python@3.8:", type=("build", "run"), when="@0.12.0:")
+
+    depends_on("py-neo@0.10.0:", type=("build", "run"), when="@0.11.0:")
+    depends_on("py-neo@0.9.0", type=("build", "run"), when="@0.9.0:0.10.0")
+    depends_on("py-neo@0.8.0", type=("build", "run"), when="@0.6.4:0.8.0")
     depends_on("py-neo@0.3.4:", type=("build", "run"), when="@0.3.0:0.4.1")
+    depends_on("py-numpy@1.19.5:", type=("build", "run"), when="@0.12.0:")
+    depends_on("py-numpy@1.18.1:1.23.5", type=("build", "run"), when="@0.6.4:0.11.2")
     depends_on("py-numpy@1.8.2:", type=("build", "run"), when="@0.3.0:0.4.1")
-    depends_on("py-quantities@0.10.1:", type=("build", "run"), when="@0.3.0:0.4.1")
+    depends_on("py-quantities@0.14.1:", type=("build", "run"), when="@0.14.0:")
+    depends_on("py-quantities@0.12.1:0.13.0,0.14.1:", type=("build", "run"), when="@0.6.4:0.13.0")
+    depends_on("py-quantities@0.10.1:0.13.0,0.14.1:", type=("build", "run"), when="@0.3.0:0.4.1")
+    depends_on("py-scipy@1.5.4:", type=("build", "run"), when="@0.6.4:")
     depends_on("py-scipy@0.14.0:", type=("build", "run"), when="@0.3.0:0.4.1")
-    depends_on("py-pandas@0.14.1:", type=("build", "run"), when="+pandas")
-    depends_on("py-numpydoc@0.5:", type=("build", "run"), when="@0.3.0:0.8.0+docs")
-    depends_on("py-numpydoc@1.1.0:", type=("build", "run"), when="@0.9.0:+docs")
-    depends_on("py-sphinx@1.2.2:", type=("build", "run"), when="@0.3.0:0.6.0+docs")
-    depends_on("py-sphinx@2.4.3:", type=("build", "run"), when="@0.7.0:0.8.0+docs")
-    depends_on("py-sphinx@3.3.0:", type=("build", "run"), when="@0.9.0:+docs")
-    depends_on("py-jupyter@1.0.0:", type=("build", "run"), when="@0.7.0:+docs")
-    depends_on("py-nbsphinx@0.5.0:", type=("build", "run"), when="@0.7.0:0.8.0+docs")
-    depends_on("py-nbsphinx@0.8.0:", type=("build", "run"), when="@0.9.0:+docs")
-    depends_on("py-sphinxcontrib-bibtex@1.0.0", type=("build", "run"), when="@0.7.0:+docs")
-    depends_on("py-sphinx-tabs@1.1.13:", type=("build", "run"), when="@0.7.0:0.8.0+docs")
-    depends_on("py-sphinx-tabs@1.3.0:", type=("build", "run"), when="@0.9.0:+docs")
-    depends_on("py-matplotlib@3.1.0:", type=("build", "run"), when="@0.8.0+docs")
-    depends_on("py-matplotlib@3.3.2:", type=("build", "run"), when="@0.9.0:+docs")
+    depends_on("py-six@1.10.0:", type=("build", "run"), when="@0.6.4:")
+    depends_on("py-tqdm", type=("build", "run"), when="@0.6.4:")
+
     depends_on("py-pandas@0.18.0:", type=("build", "run"), when="+extras")
     depends_on("py-scikit-learn@0.23.2:", type=("build", "run"), when="+extras")
     depends_on("py-statsmodels@0.12.1:", type=("build", "run"), when="+extras")
     depends_on("py-jinja2@2.11.2:", type=("build", "run"), when="+extras")
-    depends_on("py-neo@0.10.0:", type=("build", "run"), when="@0.11.0:")
-    depends_on("py-neo@0.9.0", type=("build", "run"), when="@0.9.0:0.10.0")
-    depends_on("py-neo@0.8.0", type=("build", "run"), when="@0.6.4:0.8.0")
-    depends_on("py-numpy@1.18.1:", type=("build", "run"), when="@0.6.4:")
-    depends_on("py-quantities@0.12.1:", type=("build", "run"), when="@0.6.4:")
-    depends_on("py-scipy@1.5.4:", type=("build", "run"), when="@0.6.4:")
-    depends_on("py-six@1.10.0:", type=("build", "run"), when="@0.6.4:")
-    depends_on("py-tqdm", type=("build", "run"), when="@0.6.4:")
+
+    depends_on("py-numpydoc@1.1.0:", type=("build", "run"), when="@0.9.0:+docs")
+    depends_on("py-numpydoc@0.5:", type=("build", "run"), when="@0.3.0:0.8.0+docs")
+    depends_on("py-jupyter@1.0.0:", type=("build", "run"), when="@0.7.0:+docs")
+    depends_on("py-sphinx@3.3.0:", type=("build", "run"), when="@0.9.0:+docs")
+    depends_on("py-sphinx@2.4.3:", type=("build", "run"), when="@0.7.0:0.8.0+docs")
+    depends_on("py-sphinx@1.2.2:", type=("build", "run"), when="@0.3.0:0.6.0+docs")
+    depends_on("py-nbsphinx@0.8.0:", type=("build", "run"), when="@0.9.0:+docs")
+    depends_on("py-nbsphinx@0.5.0:", type=("build", "run"), when="@0.7.0:0.8.0+docs")
+    depends_on("py-sphinxcontrib-bibtex@1.0.1:", type=("build", "run"), when="@0.7.0:+docs")
+    depends_on("py-sphinx-tabs@1.3.0:", type=("build", "run"), when="@0.9.0:+docs")
+    depends_on("py-sphinx-tabs@1.1.13:", type=("build", "run"), when="@0.7.0:0.8.0+docs")
+    depends_on("py-matplotlib@3.3.2:", type=("build", "run"), when="@0.9.0:+docs")
+    depends_on("py-matplotlib@3.1.0:", type=("build", "run"), when="@0.8.0+docs")

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

@@ -12,6 +12,8 @@ class PyGitpython(PythonPackage):
     homepage = "https://gitpython.readthedocs.org"
     pypi = "GitPython/GitPython-3.1.12.tar.gz"
 
+    version("3.1.40", sha256="22b126e9ffb671fdd0c129796343a02bf67bf2994b35449ffc9321aa755e18a4")
+    version("3.1.34", sha256="85f7d365d1f6bf677ae51039c1ef67ca59091c7ebd5a3509aa399d4eda02d6dd")
     version("3.1.27", sha256="1c885ce809e8ba2d88a29befeb385fcea06338d3640712b59ca623c220bb5704")
     version("3.1.24", sha256="df83fdf5e684fef7c6ee2c02fc68a5ceb7e7e759d08b694088d0cacb4eba59e5")
     version("3.1.23", sha256="aaae7a3bfdf0a6db30dc1f3aeae47b71cd326d86b936fe2e158aa925fdf1471c")

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

@@ -38,39 +38,39 @@ class PyH5py(PythonPackage):
     variant("mpi", default=True, description="Build with MPI support")
 
     # Python versions
-    depends_on("python@:3.9", type=("build", "run"), when="@:2.8")
-    depends_on("python@3.6:", type=("build", "run"), when="@3:3.1")
     depends_on("python@3.7:", type=("build", "run"), when="@3.2:")
+    depends_on("python@3.6:", type=("build", "run"), when="@3:3.1")
+    depends_on("python@:3.9", type=("build", "run"), when="@:2.8")
 
     # Build dependencies
-    depends_on("py-cython@0.23:0", type="build", when="@:2")
-    depends_on("py-cython@0.29:0", type=("build"), when="@3:")
-    depends_on("py-cython@0.29.14:0", type=("build"), when="@3:3.7 ^python@3.8.0:3.8")
     depends_on("py-cython@0.29.15:0", type=("build"), when="@3:3.7 ^python@3.9.0:")
+    depends_on("py-cython@0.29.14:0", type=("build"), when="@3:3.7 ^python@3.8.0:3.8")
+    depends_on("py-cython@0.29:0", type=("build"), when="@3:")
+    depends_on("py-cython@0.23:0", type="build", when="@:2")
     depends_on("py-pkgconfig", type="build")
-    depends_on("py-setuptools", type="build")
     depends_on("py-setuptools@61:", type="build", when="@3.8.0:")
+    depends_on("py-setuptools", type="build")
     depends_on("py-wheel", type="build", when="@3:")
 
     # Build and runtime dependencies
     depends_on("py-cached-property@1.5:", type=("build", "run"), when="@:3.6 ^python@:3.7")
-    depends_on("py-numpy@1.7:", type=("build", "run"), when="@:2")
-    depends_on("py-numpy@1.14.5:", type=("build", "run"), when="@3:")
-    depends_on("py-numpy@1.17.5:", type=("build", "run"), when="@3:3.5 ^python@3.8.0:3.8")
     depends_on("py-numpy@1.19.3:", type=("build", "run"), when="@3:3.5 ^python@3.9.0:")
+    depends_on("py-numpy@1.17.5:", type=("build", "run"), when="@3:3.5 ^python@3.8.0:3.8")
+    depends_on("py-numpy@1.14.5:", type=("build", "run"), when="@3:")
+    depends_on("py-numpy@1.7:", type=("build", "run"), when="@:2")
     depends_on("py-six", type=("build", "run"), when="@:2")
 
     # Link dependencies (py-h5py v2 cannot build against HDF5 1.12 regardless
     # of API setting)
-    depends_on("hdf5@1.8.4:1.11 +hl", when="@:2")
-    depends_on("hdf5@1.8.4:1.12 +hl", when="@3:3.7")
     depends_on("hdf5@1.8.4:1.14 +hl", when="@3.8:")
+    depends_on("hdf5@1.8.4:1.12 +hl", when="@3:3.7")
+    depends_on("hdf5@1.8.4:1.11 +hl", when="@:2")
 
     # MPI dependencies
     depends_on("hdf5+mpi", when="+mpi")
     depends_on("mpi", when="+mpi")
-    depends_on("py-mpi4py", when="@:2 +mpi", type=("build", "run"))
     depends_on("py-mpi4py@3.0.2:", when="@3: +mpi", type=("build", "run"))
+    depends_on("py-mpi4py", when="@:2 +mpi", type=("build", "run"))
 
     def flag_handler(self, name, flags):
         if name == "cflags":

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

@@ -66,11 +66,12 @@ def patch(self):
         )
         # 239
         filter_file(
-            "append\('/usr/include/jxrlib'\)",  # noqa: W605
+            "append('/usr/include/jxrlib')",
             "extend(('{0}/libjxr/image', '{0}/libjxr/common', '{0}/libjxr/glue'))".format(  # noqa: E501
                 spec["jxrlib-debian"].prefix.include
             ),
             "setup.py",
+            string=True,
         )
 
         # 367

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

@@ -0,0 +1,21 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyJarowinkler(PythonPackage):
+    """library for fast approximate string matching using Jaro and Jaro-Winkler similarity."""
+
+    homepage = "https://github.com/maxbachmann/JaroWinkler"
+    pypi = "jarowinkler/jarowinkler-1.2.3.tar.gz"
+
+    maintainers("LydDeb")
+
+    version("1.2.3", sha256="af28ea284cfbd1b21b29ff94b759f20e94e4f7c06f424b0b4702e701c2a21668")
+
+    depends_on("py-setuptools@42:", type="build")
+    depends_on("py-scikit-build@0.15.0", type="build")
+    depends_on("py-rapidfuzz-capi@1.0.5", type="build")

var/spack/repos/builtin/packages/py-jsonpath-ng/package.py

@@ -15,9 +15,11 @@ class PyJsonpathNg(PythonPackage):
     homepage = "https://github.com/h2non/jsonpath-ng"
     pypi = "jsonpath-ng/jsonpath-ng-1.5.2.tar.gz"
 
+    version("1.6.0", sha256="5483f8e9d74c39c9abfab554c070ae783c1c8cbadf5df60d561bc705ac68a07e")
+    version("1.5.3", sha256="a273b182a82c1256daab86a313b937059261b5c5f8c4fa3fc38b882b344dd567")
     version("1.5.2", sha256="144d91379be14d9019f51973bd647719c877bfc07dc6f3f5068895765950c69d")
 
     depends_on("py-setuptools", type="build")
     depends_on("py-ply", type=("build", "run"))
-    depends_on("py-decorator", type=("build", "run"))
-    depends_on("py-six", type=("build", "run"))
+    depends_on("py-decorator", type=("build", "run"), when="@:1.5")
+    depends_on("py-six", type=("build", "run"), when="@:1.5")

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

@@ -24,8 +24,10 @@ class PyMatplotlib(PythonPackage):
         "mpl_toolkits.mplot3d.tests",
     ]
 
+    version("3.8.2", sha256="01a978b871b881ee76017152f1f1a0cbf6bd5f7b8ff8c96df0df1bd57d8755a1")
     version("3.8.1", sha256="044df81c1f6f3a8e52d70c4cfcb44e77ea9632a10929932870dfaa90de94365d")
     version("3.8.0", sha256="df8505e1c19d5c2c26aff3497a7cbd3ccfc2e97043d1e4db3e76afa399164b69")
+    version("3.7.4", sha256="7cd4fef8187d1dd0d9dcfdbaa06ac326d396fb8c71c647129f0bf56835d77026")
     version("3.7.3", sha256="f09b3dd6bdeb588de91f853bbb2d6f0ff8ab693485b0c49035eaa510cb4f142e")
     version("3.7.2", sha256="a8cdb91dddb04436bd2f098b8fdf4b81352e68cf4d2c6756fcc414791076569b")
     version("3.7.1", sha256="7b73305f25eab4541bd7ee0b96d87e53ae9c9f1823be5659b806cd85786fe882")

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

@@ -7,16 +7,25 @@
 
 
 class PyPygithub(PythonPackage):
-    """Use the full Github API v3"""
+    """Typed interactions with the GitHub API v3"""
 
     homepage = "https://pygithub.readthedocs.io/"
     pypi = "PyGithub/PyGithub-1.54.1.tar.gz"
 
+    version("2.1.1", sha256="ecf12c2809c44147bce63b047b3d2e9dac8a41b63e90fcb263c703f64936b97c")
+    version("1.59.1", sha256="c44e3a121c15bf9d3a5cc98d94c9a047a5132a9b01d22264627f58ade9ddc217")
     version("1.55", sha256="1bbfff9372047ff3f21d5cd8e07720f3dbfdaf6462fcaed9d815f528f1ba7283")
 
     depends_on("python@3.6:", type=("build", "run"))
+    depends_on("python@3.7:", type=("build", "run"), when="@1.57:")
+
     depends_on("py-setuptools", type="build")
-    depends_on("py-deprecated", type=("build", "run"))
-    depends_on("py-pyjwt@2:", type=("build", "run"))
+    depends_on("py-setuptools-scm", type="build", when="@1.58.1:")
     depends_on("py-pynacl@1.4.0:", type=("build", "run"))
+    depends_on("py-python-dateutil", type=("build", "run"), when="@2.1.0:")
     depends_on("py-requests@2.14.0:", type=("build", "run"))
+    depends_on("py-pyjwt@2.4.0:", type=("build", "run"))
+    depends_on("py-pyjwt@2.4.0: +crypto", type=("build", "run"), when="@1.58.1:")
+    depends_on("py-typing-extensions@4:", type=("build", "run"), when="@2.1.0:")
+    depends_on("py-urllib3@1.26.0:", type=("build", "run"), when="@2.1.0:")
+    depends_on("py-deprecated", type=("build", "run"))

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

@@ -13,18 +13,19 @@ class PyQuantities(PythonPackage):
     pypi = "quantities/quantities-0.12.1.tar.gz"
     maintainers("apdavison")
 
+    version("0.14.1", sha256="efeafffc0c0364f891a9327239cd12496bccb55cd037a6d1bf44de706f722877")
     version("0.13.0", sha256="0fde20115410de21cefa786f3aeae69c1b51bb19ee492190324c1da705e61a81")
     version("0.12.5", sha256="67546963cb2a519b1a4aa43d132ef754360268e5d551b43dd1716903d99812f0")
     version("0.12.4", sha256="a33d636d1870c9e1127631185d89b0105a49f827d6aacd44ad9d8f151f331d8b")
     version("0.12.3", sha256="582f3c7aeba897846761e966615e01202a5e5d06add304492931b05085d19883")
 
-    depends_on("python@2.7.0:2.7,3.4:3.7", type=("build", "run"), when="@0.12.3")
-    depends_on("python@2.7.0:2.7,3.4:3.8", type=("build", "run"), when="@0.12.4:0.12.5")
-    depends_on("python@3.7:3.10", type=("build", "run"), when="@0.13:")
+    depends_on("python@3.8:", type=("build", "run"), when="@0.14:")
 
-    # pip silently replaces distutils with setuptools
+    depends_on("py-setuptools@61:", type="build", when="@0.14:")
     depends_on("py-setuptools", type="build")
+    depends_on("py-setuptools-scm+toml", type="build", when="@0.14:")
 
-    depends_on("py-numpy@1.8.2:1.16", type=("build", "run"), when="@0.12.3")
+    depends_on("py-numpy@1.19:", type=("build", "run"), when="@0.14:")
+    depends_on("py-numpy@1.16:", type=("build", "run"), when="@0.13")
     depends_on("py-numpy@1.8.2:1.17", type=("build", "run"), when="@0.12.4:0.12")
-    depends_on("py-numpy@1.16:", type=("build", "run"), when="@0.13.0:")
+    depends_on("py-numpy@1.8.2:1.16", type=("build", "run"), when="@0.12.3")

var/spack/repos/builtin/packages/py-rapidfuzz-capi/package.py

@@ -0,0 +1,21 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyRapidfuzzCapi(PythonPackage):
+    """
+    C-API of RapidFuzz, which can be used to extend RapidFuzz from separate packages.
+    """
+
+    homepage = "https://github.com/maxbachmann/rapidfuzz_capi"
+    pypi = "rapidfuzz_capi/rapidfuzz_capi-1.0.5.tar.gz"
+
+    maintainers("LydDeb")
+
+    version("1.0.5", sha256="b3af179874b28364ba1b7850e37d0d353de9cf5b844e3569c023b74da3a9c68e")
+
+    depends_on("py-setuptools", type="build")

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

@@ -13,12 +13,16 @@ class PyRapidfuzz(PythonPackage):
     pypi = "rapidfuzz/rapidfuzz-1.8.2.tar.gz"
 
     version("3.3.1", sha256="6783b3852f15ed7567688e2e358757a7b4f38683a915ba5edc6c64f1a3f0b450")
+    version("2.2.0", sha256="acb8839aac452ec61a419fdc8799e8a6e6cd21bed53d04678cdda6fba1247e2f")
     version("1.8.2", sha256="d6efbb2b6b18b3a67d7bdfbcd9bb72732f55736852bbef823bdf210f9e0c6c90")
 
     depends_on("python", type=("build", "link", "run"))
-    depends_on("py-setuptools@42:", when="@3:", type="build")
+    depends_on("py-setuptools@42:", when="@2:", type="build")
     depends_on("py-setuptools", type="build")
     depends_on("py-scikit-build@0.17", when="@3:", type="build")
+    depends_on("py-scikit-build@0.13:", when="@2.2:", type="build")
+    depends_on("py-rapidfuzz-capi@1.0.5", when="@2", type="build")
+    depends_on("py-jarowinkler@1.2.0:1", when="@2", type=("build", "run"))
 
     # CMakeLists.txt
     depends_on("cmake@3.12:", type="build")

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

@@ -17,6 +17,7 @@ class PyScipy(PythonPackage):
 
     version("main", branch="main")
     version("master", branch="master", deprecated=True)
+    version("1.11.4", sha256="90a2b78e7f5733b9de748f589f09225013685f9b218275257f8a8168ededaeaa")
     version("1.11.3", sha256="bba4d955f54edd61899776bad459bf7326e14b9fa1c552181f0479cc60a568cd")
     version("1.11.2", sha256="b29318a5e39bd200ca4381d80b065cdf3076c7d7281c5e36569e99273867f61d")
     version("1.11.1", sha256="fb5b492fa035334fd249f0973cc79ecad8b09c604b42a127a677b45a9a3d4289")

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

@@ -0,0 +1,23 @@
+# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class PyXyzservices(PythonPackage):
+    """xyzservices is a lightweight library providing a repository of
+    available XYZ services offering raster basemap tiles."""
+
+    homepage = "https://github.com/geopandas/xyzservices"
+    pypi = "xyzservices/xyzservices-2023.10.1.tar.gz"
+
+    license("BSD-3-Clause")
+
+    version("2023.10.1", sha256="091229269043bc8258042edbedad4fcb44684b0473ede027b5672ad40dc9fa02")
+
+    depends_on("python@3.8:", type=("build", "run"))
+
+    depends_on("py-setuptools", type="build")
+    depends_on("py-setuptools-scm", type="build")

var/spack/repos/builtin/packages/r-rlang/package.py

@@ -14,6 +14,8 @@ class RRlang(RPackage):
 
     cran = "rlang"
 
+    version("1.1.2", sha256="2a0ee1dc6e5c59b283c32db5e74e869922a336197cb406fe92622b6ec66f8092")
+    version("1.1.1", sha256="5e5ec9a7796977216c39d94b1e342e08f0681746657067ba30de11b8fa8ada99")
     version("1.1.0", sha256="f89859d91c9edc05fd7ccf21163fe53ad58da907ee273a93d5ab004a8649335b")
     version("1.0.6", sha256="e6973d98a0ea301c0da1eeaa435e9e65d1c3f0b95ed68bdc2d6cb0c610166760")
     version("1.0.2", sha256="8de87c3e6fb0b3cce2dabc6908186f8e1528cc0c16b54de965fe02d405fdd7cc")

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

@@ -15,6 +15,7 @@ class Rclone(Package):
 
     maintainers("alecbcs")
 
+    version("1.64.2", sha256="0c74d8fb887691e04e865e3b6bc32e8af47c3e54a9922ffdbed38c8323e281c9")
     version("1.63.1", sha256="0d8bf8b7460681f7906096a9d37eedecc5a1d1d3ad17652e68f0c6de104c2412")
     version("1.62.2", sha256="340371f94604e6771cc4a2c91e37d1bf00a524deab520340440fb0968e783f63")
     version("1.61.1", sha256="34b5f52047741c7bbf54572c02cc9998489c4736a753af3c99255296b1af125d")

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

@@ -14,6 +14,7 @@ class Restic(Package):
 
     maintainers("alecbcs")
 
+    version("0.16.2", sha256="88165b5b89b6064df37a9964d660f40ac62db51d6536e459db9aaea6f2b2fc11")
     version("0.16.0", sha256="b91f5ef6203a5c50a72943c21aaef336e1344f19a3afd35406c00f065db8a8b9")
     version("0.15.2", sha256="52aca841486eaf4fe6422b059aa05bbf20db94b957de1d3fca019ed2af8192b7")
     version("0.15.1", sha256="fce382fdcdac0158a35daa640766d5e8a6e7b342ae2b0b84f2aacdff13990c52")

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

@@ -34,6 +34,7 @@ class Root(CMakePackage):
     # Development version (when more recent than production).
 
     # Production version
+    version("6.30.00", sha256="0592c066954cfed42312957c9cb251654456064fe2d8dabdcb8826f1c0099d71")
     version("6.28.06", sha256="af3b673b9aca393a5c9ae1bf86eab2672aaf1841b658c5c6e7a30ab93c586533")
     version("6.28.04", sha256="70f7f86a0cd5e3f2a0befdc59942dd50140d990ab264e8e56c7f17f6bfe9c965")
     version("6.28.02", sha256="6643c07710e68972b00227c68b20b1016fec16f3fba5f44a571fa1ce5bb42faa")
@@ -160,9 +161,11 @@ class Root(CMakePackage):
     )
     variant("mysql", default=False, description="Enable support for MySQL databases")
     variant("opengl", default=True, description="Enable OpenGL support")
-    variant("oracle", default=False, description="Enable support for Oracle databases")
+    variant(
+        "oracle", when="@:6.30", default=False, description="Enable support for Oracle databases"
+    )
     variant("postgres", default=False, description="Enable postgres support")
-    variant("pythia6", default=False, description="Enable pythia6 support")
+    variant("pythia6", when="@:6.30", default=False, description="Enable pythia6 support")
     variant("pythia8", default=False, description="Enable pythia8 support")
     variant("python", default=True, description="Enable Python ROOT bindings")
     variant("qt4", when="@:6.17", default=False, description="Enable Qt graphics backend")
@@ -290,6 +293,7 @@ class Root(CMakePackage):
     depends_on("unuran", when="+unuran")
     depends_on("vc@1.0:", when="@6.07.04: +vc")
     depends_on("vc@1.3.0:", when="@6.09.02: +vc")
+    depends_on("vc@1.4.4:", when="@6.29.02: +vc")
     depends_on("vdt", when="+vdt")
     depends_on("veccore", when="+veccore")
     depends_on("libxml2", when="+xml")
@@ -320,6 +324,7 @@ class Root(CMakePackage):
     conflicts("+tmva", when="~mlp", msg="root+tmva requires MLP")
     conflicts("cxxstd=11", when="+root7", msg="root7 requires at least C++14")
     conflicts("cxxstd=11", when="@6.25.02:", msg="This version of root requires at least C++14")
+    conflicts("cxxstd=14", when="@6.30.00:", msg="This version of root requires at least C++17")
     conflicts(
         "cxxstd=20", when="@:6.28.02", msg="C++20 support requires root version at least 6.28.04"
     )

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

@@ -217,7 +217,7 @@ def configure_args(self):
         args.extend(self.enable_or_disable("pythia"))
         hepmc_root = lambda x: self.spec["hepmc"].prefix
         args.extend(self.enable_or_disable("hepmc2", activation_value=hepmc_root))
-        if self.spec.satisfies("@2.2.13:"):
+        if self.spec.satisfies("@3:"):
             args.extend(self.enable_or_disable("hepmc3", activation_value="prefix"))
             args.extend(self.enable_or_disable("rivet", activation_value="prefix"))
             args.extend(self.enable_or_disable("lhapdf", activation_value="prefix"))

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

@@ -13,6 +13,7 @@ class Vc(CMakePackage):
     git = "https://github.com/VcDevel/Vc.git"
     url = "https://github.com/VcDevel/Vc/archive/refs/tags/1.3.3.tar.gz"
 
+    version("1.4.4", sha256="5933108196be44c41613884cd56305df320263981fe6a49e648aebb3354d57f3")
     version("1.4.3", sha256="988ea0053f3fbf17544ca776a2749c097b3139089408b0286fa4e9e8513e037f")
     version("1.4.2", sha256="50d3f151e40b0718666935aa71d299d6370fafa67411f0a9e249fbce3e6e3952")
     version("1.4.1", sha256="7e8b57ed5ff9eb0835636203898c21302733973ff8eaede5134dd7cb87f915f6")

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

@@ -20,6 +20,7 @@ class Votca(CMakePackage):
     maintainers("junghans")
 
     version("master", branch="master")
+    version("2023", sha256="6150a38c77379d05592a56ae4392a00c4636d02198bb06108a3dc739a45115f8")
     version("2022.1", sha256="358119b2645fe60f88ca621aed508c49fb61f88d29d3e3fa24b5b831ed4a66ec")
     version("2022", sha256="7991137098ff4511f4ca2c6f1b6c45f53d92d9f84e5c0d0e32fbc31768f73a83")
 

var/spack/repos/builtin/packages/xrdcl-record/package.py

@@ -13,8 +13,6 @@ class XrdclRecord(CMakePackage):
     homepage = "https://github.com/xrootd/xrdcl-record"
     url = "https://github.com/xrootd/xrdcl-record/archive/refs/tags/v5.4.2.tar.gz"
 
-    maintainers("iarspider")
-
     version("5.4.2", sha256="fb76284491ff4e723bce4c9e9d87347e98e278e70c597167bc39a162bc876734")
 
     depends_on("xrootd")