ci: continue to support SPACK_SIGNING_KEY (#39170 )

usalign: update checksum (#39400 )
adios2: add mgard variant (#39405 )
2023-08-12 08:52:46 -07:00 · 2023-08-12 08:40:44 -07:00 · 2023-08-12 08:38:33 -07:00 · 2023-08-12 08:34:48 -07:00 · 2023-08-12 09:57:38 +02:00 · 2023-08-12 09:08:25 +02:00
15 changed files with 91 additions and 64 deletions
--- a/lib/spack/spack/build_systems/python.py
+++ b/lib/spack/spack/build_systems/python.py
@@ -30,7 +30,7 @@


 class PythonExtension(spack.package_base.PackageBase):
-    maintainers("adamjstewart", "pradyunsg")
+    maintainers("adamjstewart")

    @property
    def import_modules(self):
--- a/lib/spack/spack/cmd/ci.py
+++ b/lib/spack/spack/cmd/ci.py
@@ -289,6 +289,10 @@ def ci_rebuild(args):
    rebuild_everything = os.environ.get("SPACK_REBUILD_EVERYTHING")
    require_signing = os.environ.get("SPACK_REQUIRE_SIGNING")

+    # If signing key was provided via "SPACK_SIGNING_KEY", then try to import it.
+    if signing_key:
+        spack_ci.import_signing_key(signing_key)
+
    # Fail early if signing is required but we don't have a signing key
    sign_binaries = require_signing is not None and require_signing.lower() == "true"
    if sign_binaries and not spack_ci.can_sign_binaries():
@@ -418,11 +422,6 @@ def ci_rebuild(args):
                dst_file = os.path.join(repro_dir, file_name)
                shutil.copyfile(src_file, dst_file)

-    # If signing key was provided via "SPACK_SIGNING_KEY", then try to
-    # import it.
-    if signing_key:
-        spack_ci.import_signing_key(signing_key)
-
    # Write this job's spec json into the reproduction directory, and it will
    # also be used in the generated "spack install" command to install the spec
    tty.debug("job concrete spec path: {0}".format(job_spec_json_path))
@@ -679,7 +678,7 @@ def ci_rebuild(args):
                input_spec=job_spec,
                buildcache_mirror_url=buildcache_mirror_url,
                pipeline_mirror_url=pipeline_mirror_url,
-                sign_binaries=sign_binaries,
+                sign_binaries=spack_ci.can_sign_binaries(),
            ):
                msg = tty.msg if result.success else tty.warn
                msg(
--- a/lib/spack/spack/test/cmd/maintainers.py
+++ b/lib/spack/spack/test/cmd/maintainers.py
@@ -54,12 +54,10 @@ def test_all(mock_packages, capfd):
        "user3",
        "py-extension1:",
        "adamjstewart,",
-        "pradyunsg,",
        "user1,",
        "user2",
        "py-extension2:",
-        "adamjstewart,",
-        "pradyunsg",
+        "adamjstewart",
    ]

    with capfd.disabled():
@@ -74,9 +72,6 @@ def test_all_by_user(mock_packages, capfd):
        "adamjstewart:",
        "py-extension1,",
        "py-extension2",
-        "pradyunsg:",
-        "py-extension1,",
-        "py-extension2",
        "user0:",
        "maintainers-3",
        "user1:",
--- a/lib/spack/spack/test/directives.py
+++ b/lib/spack/spack/test/directives.py
@@ -78,8 +78,8 @@ def test_error_on_anonymous_dependency(config, mock_packages):
    "package_name,expected_maintainers",
    [
        ("maintainers-1", ["user1", "user2"]),
-        # Reset from PythonPackage
-        ("py-extension1", ["adamjstewart", "pradyunsg", "user1", "user2"]),
+        # Extends PythonPackage
+        ("py-extension1", ["adamjstewart", "user1", "user2"]),
        # Extends maintainers-1
        ("maintainers-3", ["user0", "user1", "user2", "user3"]),
    ],
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-sles/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-sles/spack.yaml
@@ -36,14 +36,26 @@ spack:
    elfutils:
      variants: +bzip2 ~nls +xz
      require: '%gcc'
+    unzip:
+      require: '%gcc'

  specs:
+  - adios2
+  - amrex  
  - butterflypack
+  - conduit
+  - h5bench
+  - hdf5-vol-async
+  - hdf5-vol-cache
+  - hdf5-vol-log  
  - hypre
  - kokkos
  - kokkos-kernels
+  - legion
+  - mfem
  - raja
  - superlu-dist
+  # - flux-core # python cray sles issue

  mirrors: { "mirror": "s3://spack-binaries-cray/develop/e4s-cray-sles" }

--- a/var/spack/repos/builtin/packages/adios2/package.py
+++ b/var/spack/repos/builtin/packages/adios2/package.py
@@ -65,6 +65,7 @@ class Adios2(CMakePackage, CudaPackage):
    variant("zfp", default=True, description="Enable ZFP compression")
    variant("png", default=True, when="@2.4:", description="Enable PNG compression")
    variant("sz", default=True, description="Enable SZ compression")
+    variant("mgard", default=True, when="@2.8:", description="Enable MGARD compression")

    # Rransport engines
    variant("sst", default=True, description="Enable the SST staging engine")
@@ -136,6 +137,7 @@ class Adios2(CMakePackage, CudaPackage):
    depends_on("libpng@1.6:", when="+png")
    depends_on("zfp@0.5.1:0.5", when="+zfp")
    depends_on("sz@2.0.2.0:", when="+sz")
+    depends_on("mgard", when="+mgard")

    extends("python", when="+python")
    depends_on("python@2.7:2.8,3.5:", when="@:2.4.0 +python", type=("build", "run"))
--- a/var/spack/repos/builtin/packages/cernlib/package.py
+++ b/var/spack/repos/builtin/packages/cernlib/package.py
@@ -20,6 +20,8 @@ class Cernlib(CMakePackage):
        sha256="733d148415ef78012ff81f21922d3bf641be7514b0242348dd0200cf1b003e46",
    )

+    variant("shared", default=True, description="Build shared libraries")
+
    depends_on("freetype")
    depends_on("motif")
    depends_on("libnsl")
@@ -35,5 +37,5 @@ def patch(self):
        filter_file("crypto", "crypt", "packlib/CMakeLists.txt")

    def cmake_args(self):
-        args = ["-DCERNLIB_BUILD_SHARED:BOOL=ON"]
+        args = [self.define_from_variant("CERNLIB_BUILD_SHARED", "shared")]
        return args
--- a/var/spack/repos/builtin/packages/gdal/package.py
+++ b/var/spack/repos/builtin/packages/gdal/package.py
@@ -243,9 +243,9 @@ class Gdal(CMakePackage, AutotoolsPackage, PythonExtension):

    with when("build_system=autotools"):
        depends_on("gmake", type="build")
-        depends_on("pkgconfig@0.25:", type="build")

    # Required dependencies
+    depends_on("pkgconfig@0.25:", type="build")
    depends_on("proj@6:", when="@3:")
    depends_on("proj@:6", when="@2.5:2")
    depends_on("proj@:5", when="@2.4")
--- a/var/spack/repos/builtin/packages/lammps/package.py
+++ b/var/spack/repos/builtin/packages/lammps/package.py
@@ -28,17 +28,56 @@ class Lammps(CMakePackage, CudaPackage, ROCmPackage):
    #   marked deprecated=True
    # * patch releases older than a stable release should be marked deprecated=True
    version("develop", branch="develop")
-    version("20230615", sha256="8470ed7b26ccd3728f4b44a7f1c520f1af23a648af685fd30b42b840fdfae2ff")
-    version("20230328", sha256="14f5a5c37e4b46466e90d8b35476800e66acee74999f7358f4c12dfe662bfd99")
-    version("20230208", sha256="60221242145da4479e5b207d9a0eed90af4168d7a297b4dc8c0e7f2b3215602e")
-    version("20221222", sha256="75372ee7ef982767fc4ed4dc95e20ddca8247419adeb0c1276c40e43d1eab955")
-    version("20221103", sha256="d28517b84b157d4e46a1a64ed787b4662d8f2f5ade3f5a04bb0caed068f32f7e")
-    version("20220915", sha256="392b8d35fc7919b0efaf8b389259a9b795a817e58e75e380467c63d03a0dab75")
-    version("20220803", sha256="f37cb0b35c1682ffceae5826aadce47278aa7003099a1655fcea43acd7d37926")
+    version(
+        "20230802",
+        sha256="48dc8b0b0583689e80ea2052275acbc3e3fce89707ac557e120db5564257f7df",
+        preferred=True,
+    )
+    version(
+        "20230615",
+        sha256="8470ed7b26ccd3728f4b44a7f1c520f1af23a648af685fd30b42b840fdfae2ff",
+        deprecated=True,
+    )
+    version(
+        "20230328",
+        sha256="14f5a5c37e4b46466e90d8b35476800e66acee74999f7358f4c12dfe662bfd99",
+        deprecated=True,
+    )
+    version(
+        "20230208",
+        sha256="60221242145da4479e5b207d9a0eed90af4168d7a297b4dc8c0e7f2b3215602e",
+        deprecated=True,
+    )
+    version(
+        "20221222",
+        sha256="75372ee7ef982767fc4ed4dc95e20ddca8247419adeb0c1276c40e43d1eab955",
+        deprecated=True,
+    )
+    version(
+        "20221103",
+        sha256="d28517b84b157d4e46a1a64ed787b4662d8f2f5ade3f5a04bb0caed068f32f7e",
+        deprecated=True,
+    )
+    version(
+        "20220915",
+        sha256="392b8d35fc7919b0efaf8b389259a9b795a817e58e75e380467c63d03a0dab75",
+        deprecated=True,
+    )
+    version(
+        "20220803",
+        sha256="f37cb0b35c1682ffceae5826aadce47278aa7003099a1655fcea43acd7d37926",
+        deprecated=True,
+    )
+    version(
+        "20220623.4",
+        sha256="42541b4dbd0d339d16ddb377e76d192bc3d1d5712fdf9e2cdc838fc980d0a0cf",
+        preferred=True,
+    )
    version(
        "20220623.3",
        sha256="8a276a01b50d37eecfe6eb36f420f354cde51936d20aca7944dea60d3c098c89",
        preferred=True,
+        deprecated=True,
    )
    version(
        "20220623.2",
@@ -654,9 +693,9 @@ def url_for_version(self, version):

    # Older LAMMPS does not compile with Kokkos 4.x
    conflicts(
-        "^kokkos @4:",
-        when="@:20230615",
-        msg="LAMMPS is incompatible with Kokkos 4.x until @20230615",
+        "^kokkos@4:",
+        when="@:20230802",
+        msg="LAMMPS is incompatible with Kokkos 4.x until @20230802",
    )

    patch("lib.patch", when="@20170901")
--- a/var/spack/repos/builtin/packages/py-cryptography/package.py
+++ b/var/spack/repos/builtin/packages/py-cryptography/package.py
@@ -32,7 +32,8 @@ class PyCryptography(PythonPackage):
    depends_on("py-setuptools@40.6:", when="@2.7:36", type="build")
    depends_on("py-setuptools@18.5:", when="@2.2:2.6", type="build")
    depends_on("py-setuptools@11.3:", when="@:2.1", type="build")
-    depends_on("py-setuptools-rust@0.11.4:", when="@3.4:", type=("build", "run"))
+    depends_on("py-setuptools-rust@0.11.4:", when="@3.4.2:", type="build")
+    depends_on("py-setuptools-rust@0.11.4:", when="@3.4:3.4.1", type=("build", "run"))
    depends_on("rust@1.48:", when="@38:", type="build")
    depends_on("rust@1.41:", when="@3.4.5:", type="build")
    depends_on("rust@1.45:", when="@3.4.3:3.4.4", type="build")
--- a/var/spack/repos/builtin/packages/py-picmistandard/package.py
+++ b/var/spack/repos/builtin/packages/py-picmistandard/package.py
@@ -11,27 +11,20 @@ class PyPicmistandard(PythonPackage):

    homepage = "https://picmi-standard.github.io"
    git = "https://github.com/picmi-standard/picmi.git"
-    pypi = "picmistandard/picmistandard-0.0.18.tar.gz"
+    pypi = "picmistandard/picmistandard-0.25.0.tar.gz"

    maintainers("ax3l", "dpgrote", "RemiLehe")

    version("develop", branch="master")
-    version("0.25.0", sha256="0a78b3b17054d0861626287ace1fb9321469a9c95795b92981103b27d7797f67")
+    version("0.25.0", sha256="3fe6a524822d382e52bfc9d3378249546075d28620969954c5ffb43e7968fb02")
    version("0.24.0", sha256="55a82adcc14b41eb612caf0d9e47b0e2a56ffc196a58b41fa0cc395c6924be9a")
-    version("0.23.2", sha256="e6b4c46b23520d0a97b904df90d53ff6a3209b2b6b2fa741f684c594429a591c")
-    version("0.23.1", sha256="90ad1d3d2759d910cfdb88484516b7d0434ec98e881af46961b7e2faa534434d")
+    version("0.23.2", sha256="2853fcfaf2f226a88bb6063ae564832b7e69965294fd652cd2ac04756fa4599a")
+    version("0.23.1", sha256="c7375010b7a3431b519bc0accf097f2aafdb520e2a0126f42895cb96dcc7dcf1")
    version("0.0.22", sha256="e234a431274254b22cd70be64d6555b383d98426b2763ea0c174cf77bf4d0890")
    version("0.0.21", sha256="930056a23ed92dac7930198f115b6248606b57403bffebce3d84579657c8d10b")
    version("0.0.20", sha256="9c1822eaa2e4dd543b5afcfa97940516267dda3890695a6cf9c29565a41e2905")
    version("0.0.19", sha256="4b7ba1330964fbfd515e8ea2219966957c1386e0896b92d36bd9e134afb02f5a")
    version("0.0.18", sha256="68c208c0c54b4786e133bb13eef0dd4824998da4906285987ddee84e6d195e71")
-    # 0.15 - 0.17 have broken install logic: missing requirements.txt on pypi
-    version(
-        "0.0.16",
-        sha256="b7eefdae1c43119984226b2df358c86fdeef7495084e47b3575e3d07e790ba30",
-        url="https://github.com/picmi-standard/picmi/archive/refs/tags/0.0.14.tar.gz",
-    )
-    version("0.0.14", sha256="8f83b25b281fc0309a0c4f75c7605afd5fa0ef4df3b3ac115069478c119bc8c3")

    depends_on("python@3.6:", type=("build", "run"))
    depends_on("py-numpy@1.15:1", type=("build", "run"))
--- a/var/spack/repos/builtin/packages/py-warpx/package.py
+++ b/var/spack/repos/builtin/packages/py-warpx/package.py
@@ -18,7 +18,7 @@ class PyWarpx(PythonPackage):
    """

    homepage = "https://ecp-warpx.github.io"
-    url = "https://github.com/ECP-WarpX/WarpX/archive/refs/tags/23.06.tar.gz"
+    url = "https://github.com/ECP-WarpX/WarpX/archive/refs/tags/23.07.tar.gz"
    git = "https://github.com/ECP-WarpX/WarpX.git"

    maintainers("ax3l", "dpgrote", "RemiLehe")
@@ -27,6 +27,7 @@ class PyWarpx(PythonPackage):

    # NOTE: if you update the versions here, also see warpx
    version("develop", branch="development")
+    version("23.07", sha256="511633f94c0d0205013609bde5bbf92a29c2e69f6e69b461b80d09dc25602945")
    version("23.06", sha256="75fcac949220c44dce04de581860c9a2caa31a0eee8aa7d49455fa5fc928514b")
    version("23.05", sha256="34306a98fdb1f5f44ab4fb92f35966bfccdcf1680a722aa773af2b59a3060d73")
    version("23.04", sha256="e5b285c73e13a0d922eba5d83760c168d4fd388e54a519830003b2e692dab823")
@@ -45,19 +46,11 @@ class PyWarpx(PythonPackage):
    version("22.03", sha256="ddbef760c8000f2f827dfb097ca3359e7aecbea8766bec5c3a91ee28d3641564")
    version("22.02", sha256="d74b593d6f396e037970c5fbe10c2e5d71d557a99c97d40e4255226bc6c26e42")
    version("22.01", sha256="e465ffadabb7dc360c63c4d3862dc08082b5b0e77923d3fb05570408748b0d28")
-    version("21.12", sha256="847c98aac20c73d94c823378803c82be9a14139f1c14ea483757229b452ce4c1")
-    version("21.11", sha256="ce60377771c732033a77351cd3500b24b5d14b54a5adc7a622767b9251c10d0b")
-    version("21.10", sha256="d372c573f0360094d5982d64eceeb0149d6620eb75e8fdbfdc6777f3328fb454")
-    version("21.09", sha256="861a65f11846541c803564db133c8678b9e8779e69902ef1637b21399d257eab")
-    version("21.08", sha256="6128a32cfd075bc63d08eebea6d4f62d33ce0570f4fd72330a71023ceacccc86")
-    version("21.07", sha256="a8740316d813c365715f7471201499905798b50bd94950d33f1bd91478d49561")
-    version("21.06", sha256="a26039dc4061da45e779dd5002467c67a533fc08d30841e01e7abb3a890fbe30")
-    version("21.05", sha256="f835f0ae6c5702550d23191aa0bb0722f981abb1460410e3d8952bc3d945a9fc")
-    version("21.04", sha256="51d2d8b4542eada96216e8b128c0545c4b7527addc2038efebe586c32c4020a0")

    variant("mpi", default=True, description="Enable MPI support")

    for v in [
+        "23.07",
        "23.06",
        "23.05",
        "23.04",
@@ -76,15 +69,6 @@ class PyWarpx(PythonPackage):
        "22.03",
        "22.02",
        "22.01",
-        "21.12",
-        "21.11",
-        "21.10",
-        "21.09",
-        "21.08",
-        "21.07",
-        "21.06",
-        "21.05",
-        "21.04",
        "develop",
    ]:
        depends_on("warpx@{0}".format(v), when="@{0}".format(v), type=["build", "link"])
@@ -94,14 +78,13 @@ class PyWarpx(PythonPackage):
    depends_on("py-numpy@1.15.0:1", type=("build", "run"))
    depends_on("py-mpi4py@2.1.0:", type=("build", "run"), when="+mpi")
    depends_on("py-periodictable@1.5:1", type=("build", "run"))
-    depends_on("py-picmistandard@0.0.14", type=("build", "run"), when="@21.03:21.11")
-    depends_on("py-picmistandard@0.0.16", type=("build", "run"), when="@21.12")
    depends_on("py-picmistandard@0.0.18", type=("build", "run"), when="@22.01")
    depends_on("py-picmistandard@0.0.19", type=("build", "run"), when="@22.02:22.09")
    depends_on("py-picmistandard@0.0.20", type=("build", "run"), when="@22.10:22.11")
    depends_on("py-picmistandard@0.0.22", type=("build", "run"), when="@22.12:23.03")
    depends_on("py-picmistandard@0.23.2", type=("build", "run"), when="@23.04:23.05")
-    depends_on("py-picmistandard@0.24.0", type=("build", "run"), when="@23.06:")
+    depends_on("py-picmistandard@0.24.0", type=("build", "run"), when="@23.06")
+    depends_on("py-picmistandard@0.25.0", type=("build", "run"), when="@23.07:")
    depends_on("py-setuptools@42:", type="build")
    # Since we use PYWARPX_LIB_DIR to pull binaries out of the
    # 'warpx' spack package, we don't need py-cmake as declared
--- a/var/spack/repos/builtin/packages/python/package.py
+++ b/var/spack/repos/builtin/packages/python/package.py
@@ -32,7 +32,7 @@ class Python(Package):
    list_depth = 1
    tags = ["windows"]

-    maintainers("adamjstewart", "skosukhin", "scheibelp", "pradyunsg")
+    maintainers("adamjstewart", "skosukhin", "scheibelp")

    phases = ["configure", "build", "install"]

--- a/var/spack/repos/builtin/packages/usalign/package.py
+++ b/var/spack/repos/builtin/packages/usalign/package.py
@@ -26,7 +26,7 @@ class Usalign(Package):
    # date assumed from paper publication date
    version(
        "20220829",
-        sha256="9ee129017a68125c22ce89123ecbac9421add87ee077cd1994c6e8a39a8a8b21",
+        sha256="fdc447a0c48813f91cf3045b9c19bd0c6b98fc6a3ad23780ef75fac8d4662e8c",
        expand=False,
    )

--- a/var/spack/repos/builtin/packages/warpx/package.py
+++ b/var/spack/repos/builtin/packages/warpx/package.py
@@ -17,7 +17,7 @@ class Warpx(CMakePackage):
    """

    homepage = "https://ecp-warpx.github.io"
-    url = "https://github.com/ECP-WarpX/WarpX/archive/refs/tags/23.06.tar.gz"
+    url = "https://github.com/ECP-WarpX/WarpX/archive/refs/tags/23.07.tar.gz"
    git = "https://github.com/ECP-WarpX/WarpX.git"

    maintainers("ax3l", "dpgrote", "MaxThevenet", "RemiLehe")
@@ -25,6 +25,7 @@ class Warpx(CMakePackage):

    # NOTE: if you update the versions here, also see py-warpx
    version("develop", branch="development")
+    version("23.07", sha256="511633f94c0d0205013609bde5bbf92a29c2e69f6e69b461b80d09dc25602945")
    version("23.06", sha256="75fcac949220c44dce04de581860c9a2caa31a0eee8aa7d49455fa5fc928514b")
    version("23.05", sha256="34306a98fdb1f5f44ab4fb92f35966bfccdcf1680a722aa773af2b59a3060d73")
    version("23.04", sha256="e5b285c73e13a0d922eba5d83760c168d4fd388e54a519830003b2e692dab823")
Author	SHA1	Message	Date
Scott Wittenburg	1b1ed1b1fa	ci: continue to support SPACK_SIGNING_KEY (#39170 )	2023-08-12 08:52:46 -07:00
snehring	ec0e51316b	usalign: update checksum (#39400 )	2023-08-12 08:40:44 -07:00
Vicente Bolea	533821e46f	adios2: add mgard variant (#39405 )	2023-08-12 08:38:33 -07:00
Wouter Deconinck	6c5d125cb0	cernlib: new variant shared (#39406 ) This allows users to install cernlib with static libraries only, instead of both static and shared.	2023-08-12 08:34:48 -07:00
Richard Berger	668fb1201f	lammps: new stable versions, deprecate older patch versions (#39317 )	2023-08-12 09:57:38 +02:00
Adam J. Stewart	f7918fd8ab	Python: remove maintainer (#39384 )	2023-08-12 09:08:25 +02:00
Axel Huebl	fc1996e0fa	WarpX 23.07 (#39108 ) * WarpX 23.07 Update WarpX and related Python packages to the lastest releases. * py-picmistandard: refresh hashes Keeping even a single `git` version in here confuses the fetcher. Remove broken old versions. * Remove `py-warpx` versions with broken PICMI	2023-08-11 17:35:04 -07:00
eugeneswalker	ed3aaafd73	e4s cray sles ci: expand spec list (#39081 ) * e4s cray sles ci: expand spec list * flux-core: disable until python+gary-sles issue is resolved	2023-08-11 23:42:10 +00:00
Wouter Deconinck	63bb2c9bad	py-cryptography: does not run-depend on py-setuptools-rust (#39386 ) * py-cryptography: does not run-depend on py-setuptools-rust * py-cryptography: depens_on py-setuptools-rust when @3.4.2: Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> * py-cryptography: re-add depends_on type=run for narrow range --------- Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>	2023-08-11 17:53:25 +00:00